From 8e65f7f0cc8ea108083b20ba258ed052b43bc6de Mon Sep 17 00:00:00 2001 From: Default email Date: Sat, 5 Mar 2022 17:20:37 +0100 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 062a0c5437b68f950b081bbfc8a699d57a4ee026 --- third_party/nixpkgs/.git-blame-ignore-revs | 32 + third_party/nixpkgs/.github/CODEOWNERS | 4 +- third_party/nixpkgs/.github/labeler.yml | 2 +- .../nixpkgs/.github/workflows/backport.yml | 2 +- .../nixpkgs/.github/workflows/basic-eval.yml | 2 +- .../.github/workflows/editorconfig.yml | 2 +- .../nixpkgs/.github/workflows/labels.yml | 2 +- .../.github/workflows/manual-nixos.yml | 2 +- .../.github/workflows/manual-nixpkgs.yml | 2 +- .../.github/workflows/nixos-manual.yml | 2 +- .../.github/workflows/periodic-merge-24h.yml | 2 +- .../.github/workflows/periodic-merge-6h.yml | 2 +- .../workflows/update-terraform-providers.yml | 2 +- .../doc/builders/packages/steam.section.md | 2 +- .../submitting-changes.chapter.md | 2 +- .../doc/languages-frameworks/coq.section.md | 3 +- .../languages-frameworks/python.section.md | 25 + .../doc/languages-frameworks/rust.section.md | 2 + .../doc/languages-frameworks/vim.section.md | 8 +- third_party/nixpkgs/lib/default.nix | 2 +- third_party/nixpkgs/lib/modules.nix | 5 +- third_party/nixpkgs/lib/tests/modules.sh | 27 + .../nixpkgs/lib/tests/modules/emptyValues.nix | 36 + .../lib/tests/modules/freeform-submodules.nix | 22 + .../lib/tests/modules/optionTypeFile.nix | 28 + .../lib/tests/modules/optionTypeMerging.nix | 27 + third_party/nixpkgs/lib/tests/modules/raw.nix | 30 + third_party/nixpkgs/lib/types.nix | 44 +- .../nixpkgs/maintainers/maintainer-list.nix | 86 +- .../maintainers/scripts/pluginupdate.py | 116 +- .../maintainers/scripts/remove-old-aliases.py | 202 + .../nixpkgs/maintainers/scripts/update.nix | 2 +- .../nixpkgs/maintainers/scripts/update.py | 4 + third_party/nixpkgs/maintainers/team-list.nix | 1 + .../option-declarations.section.md | 26 +- .../development/option-types.section.md | 24 +- .../development/settings-options.section.md | 45 + .../development/unit-handling.section.md | 15 +- .../option-declarations.section.xml | 29 +- .../development/option-types.section.xml | 41 +- .../development/settings-options.section.xml | 104 + .../development/unit-handling.section.xml | 22 +- .../from_md/release-notes/rl-2111.section.xml | 33 +- .../from_md/release-notes/rl-2205.section.xml | 309 +- .../manual/release-notes/release-notes.xml | 1 + .../manual/release-notes/rl-2111.section.md | 13 +- .../manual/release-notes/rl-2205.section.md | 145 +- third_party/nixpkgs/nixos/lib/utils.nix | 5 +- .../nixos/modules/hardware/all-firmware.nix | 1 + .../nixpkgs/nixos/modules/hardware/xone.nix | 23 + .../installer/sd-card/sd-image-aarch64.nix | 6 + .../nixos/modules/misc/documentation.nix | 2 +- .../nixpkgs/nixos/modules/misc/ids.nix | 6 +- .../nixpkgs/nixos/modules/misc/version.nix | 49 +- .../nixpkgs/nixos/modules/misc/wordlist.nix | 59 + .../nixpkgs/nixos/modules/module-list.nix | 13 +- .../nixos/modules/programs/firejail.nix | 4 +- .../nixos/modules/programs/k40-whisperer.nix | 40 + .../nixpkgs/nixos/modules/programs/phosh.nix | 19 +- .../nixpkgs/nixos/modules/programs/sway.nix | 1 + third_party/nixpkgs/nixos/modules/rename.nix | 4 +- .../nixpkgs/nixos/modules/security/pam.nix | 2 +- .../nixpkgs/nixos/modules/security/polkit.nix | 6 +- .../modules/security/systemd-confinement.nix | 4 +- .../nixos/modules/services/admin/pgadmin.nix | 127 + .../modules/services/audio/snapserver.nix | 26 +- .../services/cluster/kubernetes/pki.nix | 2 +- .../modules/services/databases/virtuoso.nix | 99 - .../modules/services/desktops/flatpak.nix | 2 + .../pipewire/daemon/client-rt.conf.json | 2 +- .../pipewire/daemon/minimal.conf.json | 118 + .../pipewire/daemon/pipewire-pulse.conf.json | 65 +- .../pipewire/daemon/pipewire.conf.json | 7 +- .../pipewire/pipewire-media-session.nix | 5 +- .../services/desktops/pipewire/pipewire.nix | 5 +- .../desktops/pipewire/wireplumber.nix | 11 +- .../modules/services/development/zammad.nix | 323 + .../modules/services/hardware/udisks2.nix | 2 + .../home-automation/home-assistant.nix | 8 +- .../{misc => home-automation}/zigbee2mqtt.nix | 0 .../modules/services/logging/logrotate.nix | 36 +- .../matrix-synapse-log_config.yaml | 0 .../services/matrix/matrix-synapse.nix | 773 ++ .../{misc => matrix}/matrix-synapse.xml | 35 +- .../modules/services/misc/matrix-synapse.nix | 844 -- .../modules/services/misc/nix-daemon.nix | 34 + .../nixos/modules/services/misc/plex.nix | 13 + .../services/network-filesystems/ipfs.nix | 2 +- .../modules/services/networking/bird.nix | 184 +- .../modules/services/networking/murmur.nix | 2 +- .../services/networking/networkmanager.nix | 1 + .../services/networking/snowflake-proxy.nix | 81 + .../modules/services/networking/tetrd.nix | 2 +- .../modules/services/security/clamav.nix | 9 +- .../nixos/modules/services/security/fprot.nix | 82 - .../modules/services/security/opensnitch.nix | 103 +- .../modules/services/security/step-ca.nix | 11 + .../services/security/vaultwarden/default.nix | 4 +- .../modules/services/system/earlyoom.nix | 35 +- .../nixos/modules/services/wayland/cage.nix | 2 + .../modules/services/web-apps/miniflux.nix | 46 +- .../modules/services/web-apps/peertube.nix | 12 +- .../services/web-servers/nginx/default.nix | 12 + .../services/x11/display-managers/lightdm.nix | 2 + .../nixos/modules/services/x11/xserver.nix | 3 - .../activation/switch-to-configuration.pl | 9 +- .../nixos/modules/system/boot/modprobe.nix | 2 + .../modules/system/boot/systemd-nspawn.nix | 8 - .../nixos/modules/system/boot/systemd.nix | 19 + .../modules/virtualisation/amazon-image.nix | 5 + .../openstack-metadata-fetcher.nix | 3 +- .../modules/virtualisation/proxmox-lxc.nix | 64 + .../nixpkgs/nixos/release-combined.nix | 4 +- third_party/nixpkgs/nixos/release-small.nix | 6 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 14 +- third_party/nixpkgs/nixos/tests/bird.nix | 132 +- third_party/nixpkgs/nixos/tests/cntr.nix | 20 +- .../nixpkgs/nixos/tests/home-assistant.nix | 43 - .../nixpkgs/nixos/tests/kubernetes/base.nix | 4 +- .../nixpkgs/nixos/tests/kubernetes/rbac.nix | 4 +- third_party/nixpkgs/nixos/tests/logrotate.nix | 37 + .../nixos/tests/matrix-appservice-irc.nix | 42 +- .../nixpkgs/nixos/tests/matrix-synapse.nix | 64 +- .../nixpkgs/nixos/tests/matrix/mjolnir.nix | 41 +- .../nixos/tests/matrix/pantalaimon.nix | 29 +- third_party/nixpkgs/nixos/tests/miniflux.nix | 24 +- third_party/nixpkgs/nixos/tests/nano.nix | 44 - .../nixpkgs/nixos/tests/networking.nix | 12 +- .../nixpkgs/nixos/tests/nginx-modsecurity.nix | 39 + .../nixpkgs/nixos/tests/nixops/default.nix | 2 +- .../nixos/tests/pgadmin4-standalone.nix | 43 + third_party/nixpkgs/nixos/tests/pgadmin4.nix | 142 + .../nixpkgs/nixos/tests/podman/default.nix | 2 +- .../nixos/tests/podman/tls-ghostunnel.nix | 2 +- third_party/nixpkgs/nixos/tests/shiori.nix | 1 - .../nixpkgs/nixos/tests/switch-test.nix | 198 +- .../nixos/tests/systemd-confinement.nix | 29 +- .../nixos/tests/systemd-machinectl.nix | 85 + third_party/nixpkgs/nixos/tests/tinywl.nix | 1 + third_party/nixpkgs/nixos/tests/vsftpd.nix | 42 + third_party/nixpkgs/nixos/tests/zammad.nix | 60 + .../applications/audio/cardinal/default.nix | 76 + .../pkgs/applications/audio/carla/default.nix | 4 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../applications/audio/geonkick/default.nix | 4 +- .../audio/goattracker/default.nix | 5 +- .../applications/audio/helvum/default.nix | 3 +- .../applications/audio/jamesdsp/default.nix | 10 +- .../applications/audio/jamulus/default.nix | 4 +- .../applications/audio/lyrebird/default.nix | 2 +- .../audio/netease-cloud-music-gtk/default.nix | 1 - .../audio/new-session-manager/default.nix | 6 +- .../applications/audio/plexamp/default.nix | 6 +- .../audio/plujain-ramp/default.nix | 2 +- .../pkgs/applications/audio/praat/default.nix | 4 +- .../applications/audio/pt2-clone/default.nix | 4 +- .../applications/audio/r128gain/default.nix | 10 +- .../audio/roomeqwizard/default.nix | 2 +- .../applications/audio/rubyripper/default.nix | 34 +- .../audio/sony-headphones-client/default.nix | 2 +- .../applications/audio/sptlrx/default.nix | 6 +- .../applications/audio/strawberry/default.nix | 4 +- .../pkgs/applications/audio/tauon/default.nix | 4 +- .../applications/audio/termusic/default.nix | 28 + .../applications/audio/vgmstream/default.nix | 33 +- .../applications/audio/vgmstream/update.sh | 77 + .../pkgs/applications/audio/vmpk/default.nix | 4 +- .../applications/audio/yoshimi/default.nix | 69 +- .../applications/audio/zrythm/default.nix | 18 +- .../blockchains/bisq-desktop/default.nix | 2 +- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 47 +- .../blockchains/crypto-org-wallet/default.nix | 2 +- .../blockchains/elements/default.nix | 4 +- .../pkgs/applications/blockchains/erigon.nix | 6 +- .../blockchains/exodus/default.nix | 4 +- .../blockchains/lightwalletd/default.nix | 4 +- .../blockchains/monero-gui/default.nix | 2 +- .../blockchains/mycrypto/default.nix | 2 +- .../blockchains/namecoin/default.nix | 4 +- .../nbxplorer/util/update-common.sh | 2 +- .../applications/blockchains/oxen/default.nix | 7 +- .../applications/blockchains/pivx/default.nix | 2 +- .../blockchains/wasabiwallet/default.nix | 2 +- .../editors/android-studio/common.nix | 18 +- .../applications/editors/cudatext/default.nix | 4 +- .../applications/editors/cudatext/deps.json | 20 +- .../applications/editors/cudatext/update.sh | 2 +- .../editors/eclipse/build-eclipse.nix | 5 +- .../emacs/elisp-packages/elpa-generated.nix | 108 +- .../emacs/elisp-packages/nongnu-generated.nix | 18 +- .../elisp-packages/recipes-archive-melpa.json | 2151 ++-- .../applications/editors/emacs/generic.nix | 7 +- .../applications/editors/jetbrains/common.nix | 6 +- .../editors/jetbrains/default.nix | 18 +- .../editors/kdevelop5/kdev-php.nix | 10 +- .../editors/kdevelop5/kdev-python.nix | 10 +- .../editors/kodestudio/default.nix | 2 +- .../editors/leo-editor/default.nix | 8 +- .../applications/editors/nano/default.nix | 10 +- .../editors/nano/test-with-expect.nix | 35 + .../applications/editors/netbeans/default.nix | 2 +- .../applications/editors/okteta/default.nix | 4 +- .../applications/editors/pinegrow/default.nix | 70 + .../editors/quartus-prime/default.nix | 2 +- .../editors/rednotebook/default.nix | 4 +- .../applications/editors/rstudio/default.nix | 9 +- .../applications/editors/sigil/default.nix | 4 +- .../editors/standardnotes/default.nix | 6 +- .../editors/sublime/2/default.nix | 2 +- .../editors/texstudio/default.nix | 4 +- .../applications/editors/texworks/default.nix | 4 +- .../applications/editors/thonny/default.nix | 2 +- .../pkgs/applications/editors/vim/macvim.nix | 6 +- .../applications/editors/vim/macvim.patch | 66 +- .../editors/vim/plugins}/aliases.nix | 0 .../editors/vim/plugins}/build-vim-plugin.nix | 0 .../editors/vim/plugins}/default.nix | 0 .../editors/vim/plugins}/deprecated.json | 0 .../editors/vim/plugins}/generated.nix | 1074 +- .../fix-node-paths.patch | 0 .../markdown-preview-nvim/package.json | 0 .../editors/vim/plugins}/overrides.nix | 4 +- .../plugins}/patches/fruzzy/get_version.patch | 0 .../remove_duplicate_g_lens_animate.patch | 0 .../plugins}/patches/sniprun/fix-paths.patch | 0 .../set_default_languagetool.patch | 0 .../editors/vim/plugins}/readme.md | 0 .../editors/vim/plugins}/update-shell.nix | 3 +- .../editors/vim/plugins}/update.py | 8 +- .../editors/vim/plugins}/vim-gen-doc-hook.sh | 0 .../editors/vim/plugins}/vim-plugin-names | 9 +- .../editors/vim/plugins}/vim-utils.nix | 3 +- .../editors/vim/plugins}/vim2nix/README.txt | 0 .../vim/plugins}/vim2nix/addon-info.json | 0 .../vim/plugins}/vim2nix/autoload/nix.vim | 0 .../pkgs/applications/editors/vis/default.nix | 12 +- .../_maintainers/update-bin-srcs-lib.sh | 0 .../vscode/extensions}/cpptools/default.nix | 20 +- .../extensions}/cpptools/missing_elf_deps.sh | 0 .../cpptools/package-activation-events.json | 0 .../extensions}/cpptools/update_helper.sh | 0 .../editors/vscode/extensions}/default.nix | 52 +- .../vscode/extensions}/language-packs.nix | 0 .../extensions}/mktplcExtRefToFetchArgs.nix | 0 .../ms-dotnettools-csharp/default.nix | 0 .../rt-deps-bin-srcs.json | 0 .../ms-dotnettools-csharp/update-bin-srcs | 0 .../ms-toolsai-jupyter/default.nix | 0 .../ms-vsliveshare-vsliveshare/default.nix | 0 .../ms-vsliveshare-vsliveshare/noop-syslog.c | 0 .../vscode/extensions}/python/default.nix | 4 +- .../extensions}/python/extract-nuget.nix | 0 .../vscode/extensions}/remote-ssh/default.nix | 0 .../vscode/extensions}/rescript/default.nix | 0 .../rescript/rescript-editor-analysis.nix | 0 .../rust-analyzer/build-deps/package.json | 0 .../extensions}/rust-analyzer/default.nix | 2 +- .../vscode/extensions}/terraform/default.nix | 0 .../terraform/fix-terraform-ls.patch | 0 .../vscode/extensions}/updateSettings.nix | 0 .../vscode/extensions}/updateSettingsTest.nix | 0 .../extensions}/update_installed_exts.sh | 2 +- .../vscode-lldb/build-deps/package.json | 0 .../cmake-build-extension-only.patch | 0 .../extensions}/vscode-lldb/default.nix | 2 +- .../vscode/extensions}/vscode-lldb/lldb.nix | 0 .../vscode-lldb/reset-cargo-config.patch | 0 .../vscode/extensions}/vscode-lldb/update.sh | 8 +- .../vscode/extensions}/vscode-utils.nix | 0 .../editors/vscode/extensions}/vscodeEnv.nix | 0 .../vscode/extensions}/vscodeEnvTest.nix | 0 .../vscode/extensions}/vscodeExts2nix.nix | 0 .../extensions}/vscodeWithConfiguration.nix | 0 .../vscode/extensions}/wakatime/default.nix | 4 +- .../applications/editors/vscode/generic.nix | 35 +- .../editors/vscode/update-shell.nix | 18 + .../editors/vscode/update-vscode.sh | 4 +- .../editors/vscode/update-vscodium.sh | 4 +- .../applications/editors/vscode/vscode.nix | 12 +- .../applications/editors/vscode/vscodium.nix | 10 +- .../applications/editors/xxe-pe/default.nix | 2 +- .../applications/emulators/ccemux/default.nix | 2 +- .../emulators/dosbox-staging/default.nix | 2 +- .../applications/emulators/dosbox/default.nix | 2 +- .../applications/emulators/mame/default.nix | 2 +- .../emulators/mednafen/default.nix | 18 +- .../emulators/mednaffe/default.nix | 10 +- .../applications/emulators/mgba/default.nix | 4 +- .../applications/emulators/punes/default.nix | 14 +- .../emulators/ryujinx/default.nix | 60 +- .../applications/emulators/ryujinx/deps.nix | 4 +- .../applications/emulators/ryujinx/updater.sh | 67 +- .../applications/emulators/vice/default.nix | 2 +- .../applications/emulators/zsnes/default.nix | 2 +- .../applications/gis/qgis/unwrapped-ltr.nix | 17 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 6 +- .../applications/graphics/ImageMagick/7.0.nix | 67 +- .../graphics/antimony/default.nix | 10 +- .../applications/graphics/avocode/default.nix | 2 +- .../graphics/evilpixie/default.nix | 4 +- .../applications/graphics/fiji/default.nix | 13 +- .../applications/graphics/hydrus/default.nix | 4 +- .../applications/graphics/imagej/default.nix | 2 +- .../applications/graphics/ipe/default.nix | 10 +- .../graphics/mandelbulber/default.nix | 6 +- .../applications/graphics/meshlab/default.nix | 4 +- .../applications/graphics/nsxiv/default.nix | 61 + .../graphics/openboard/default.nix | 4 +- .../applications/graphics/pinta/default.nix | 4 + .../graphics/skanpage/default.nix | 36 + .../graphics/swingsane/default.nix | 2 +- .../graphics/write_stylus/default.nix | 2 +- .../applications/graphics/xournal/default.nix | 4 +- .../nixpkgs/pkgs/applications/kde/default.nix | 4 + .../pkgs/applications/kde/ktorrent.nix | 22 + .../pkgs/applications/kde/libktorrent.nix | 22 + .../pkgs/applications/kde/skanlite.nix | 18 + .../nixpkgs/pkgs/applications/kde/zanshin.nix | 18 + .../pkgs/applications/misc/OSCAR/default.nix | 10 +- .../applications/misc/archivy/default.nix | 34 +- .../pkgs/applications/misc/avizo/default.nix | 11 +- .../avizo/use-sysconfdir-instead-of-etc.patch | 15 - .../misc/azuredatastudio/default.nix | 36 +- .../pkgs/applications/misc/bemenu/default.nix | 4 +- .../applications/misc/bottles/default.nix | 5 +- .../applications/misc/calibre/default.nix | 10 +- .../pkgs/applications/misc/charm/default.nix | 6 +- .../applications/misc/cherrytree/default.nix | 4 +- .../applications/misc/corectrl/default.nix | 4 +- .../misc/cubiomes-viewer/default.nix | 2 +- .../pkgs/applications/misc/cura/stable.nix | 2 +- .../applications/misc/curaengine/default.nix | 4 +- .../applications/misc/dbeaver/default.nix | 8 +- .../pkgs/applications/misc/dunst/default.nix | 4 +- .../misc/electrum-grs/default.nix | 2 +- .../applications/misc/emojipick/default.nix | 71 + .../misc/firefly-desktop/default.nix | 4 +- .../pkgs/applications/misc/fnott/default.nix | 4 +- .../pkgs/applications/misc/free42/default.nix | 6 +- .../misc/ganttproject-bin/default.nix | 2 +- .../pkgs/applications/misc/genact/default.nix | 6 +- .../applications/misc/geoipupdate/default.nix | 8 +- .../applications/misc/gkrellm/default.nix | 2 +- .../applications/misc/globe-cli/default.nix | 20 + .../misc/golden-cheetah/default.nix | 2 +- .../applications/misc/gometer/default.nix | 47 + .../applications/misc/gpsprune/default.nix | 2 +- .../pkgs/applications/misc/gsctl/default.nix | 19 +- .../applications/misc/hcl2json/default.nix | 27 + .../applications/misc/ideamaker/default.nix | 4 +- .../applications/misc/ipmiview/default.nix | 2 +- .../misc/joplin-desktop/default.nix | 6 +- .../applications/misc/jotta-cli/default.nix | 4 +- .../misc/k40-whisperer/default.nix | 74 + .../applications/misc/keepass/default.nix | 7 +- .../applications/misc/klayout/default.nix | 14 +- .../applications/misc/koreader/default.nix | 4 +- .../applications/misc/limesctl/default.nix | 6 +- .../pkgs/applications/misc/logseq/default.nix | 4 +- .../applications/misc/lsd2dsl/default.nix | 2 +- .../applications/misc/mapproxy/default.nix | 4 +- .../applications/misc/markets/default.nix | 4 +- .../pkgs/applications/misc/mdzk/default.nix | 6 +- .../applications/misc/michabo/default.nix | 1 - .../applications/misc/minigalaxy/default.nix | 6 +- .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../pkgs/applications/misc/mob/default.nix | 4 +- .../misc/mobilecoin-wallet/default.nix | 4 +- .../misc/natural-docs/default.nix | 4 +- .../pkgs/applications/misc/neo/default.nix | 4 +- .../misc/nerd-font-patcher/default.nix | 17 +- .../applications/misc/obinskit/default.nix | 2 +- .../applications/misc/obsidian/default.nix | 2 +- .../pkgs/applications/misc/oil/default.nix | 45 + .../pkgs/applications/misc/openlp/default.nix | 3 +- .../applications/misc/opentrack/default.nix | 2 +- .../applications/misc/otpclient/default.nix | 4 +- .../misc/pdfsam-basic/default.nix | 4 +- .../applications/misc/pdfstudio/common.nix | 6 +- .../pkgs/applications/misc/plater/default.nix | 2 +- .../applications/misc/playonlinux/default.nix | 21 +- .../pkgs/applications/misc/premid/default.nix | 2 +- .../misc/prusa-slicer/default.nix | 8 +- .../misc/prusa-slicer/super-slicer.nix | 4 +- .../misc/qMasterPassword/default.nix | 10 +- .../remarkable/remarkable-mouse/default.nix | 4 +- .../misc/remarkable/rmview/default.nix | 8 +- .../pkgs/applications/misc/robo3t/default.nix | 2 +- .../pkgs/applications/misc/rofi/default.nix | 7 +- .../pkgs/applications/misc/seatd/default.nix | 4 +- .../applications/misc/sidequest/default.nix | 2 +- .../applications/misc/simplenote/default.nix | 5 +- .../pkgs/applications/misc/skate/default.nix | 6 +- .../pkgs/applications/misc/slic3r/default.nix | 2 +- .../pkgs/applications/misc/slides/default.nix | 6 +- .../misc/snapmaker-luban/default.nix | 2 +- .../applications/misc/stretchly/default.nix | 2 +- .../pkgs/applications/misc/survex/default.nix | 91 +- .../applications/misc/sweethome3d/default.nix | 2 +- .../applications/misc/sweethome3d/editors.nix | 2 +- .../misc/teleprompter/default.nix | 1 - .../pkgs/applications/misc/ticker/default.nix | 6 +- .../misc/toggldesktop/default.nix | 2 +- .../applications/misc/trenchbroom/default.nix | 2 +- .../applications/misc/tty-share/default.nix | 10 +- .../pkgs/applications/misc/tvbrowser/bin.nix | 8 +- .../pkgs/applications/misc/upwork/default.nix | 6 +- .../pkgs/applications/misc/wego/default.nix | 24 +- .../pkgs/applications/misc/wego/deps.nix | 48 - .../applications/misc/whalebird/default.nix | 4 +- .../pkgs/applications/misc/xmind/default.nix | 4 +- .../pkgs/applications/misc/xpdf/default.nix | 3 +- .../pkgs/applications/misc/xplr/default.nix | 6 +- .../pkgs/applications/misc/zettlr/default.nix | 4 +- .../networking/aether/default.nix | 4 +- .../apache-directory-studio/default.nix | 2 +- .../networking/blocky/default.nix | 6 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 4 +- .../networking/browsers/chromium/default.nix | 9 +- .../browsers/chromium/upstream-info.json | 52 +- .../browsers/firefox-bin/release_sources.nix | 786 +- .../networking/browsers/firefox/common.nix | 23 +- .../networking/browsers/firefox/packages.nix | 8 +- .../networking/browsers/firefox/wrapper.nix | 7 +- .../networking/browsers/lagrange/default.nix | 4 +- .../networking/browsers/opera/default.nix | 4 +- .../tor-browser-bundle-bin/default.nix | 4 +- .../networking/browsers/vieb/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../browsers/webbrowser/default.nix | 4 +- .../networking/charles/default.nix | 13 +- .../networking/cisco-packet-tracer/7.nix | 2 +- .../networking/cisco-packet-tracer/8.nix | 2 +- .../cluster/argo-rollouts/default.nix | 27 + .../networking/cluster/argo/default.nix | 9 +- .../networking/cluster/bosh-cli/default.nix | 4 +- .../networking/cluster/cilium/default.nix | 4 +- .../networking/cluster/cni/plugins.nix | 4 +- .../networking/cluster/fluxcd/default.nix | 8 +- .../networking/cluster/fn-cli/default.nix | 4 +- .../networking/cluster/glooctl/default.nix | 6 +- .../networking/cluster/hadoop/default.nix | 82 +- .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/k3s/default.nix | 24 +- .../networking/cluster/k3s/update.sh | 56 +- .../networking/cluster/kops/default.nix | 4 +- .../cluster/kubeconform/default.nix | 4 +- .../networking/cluster/kubernetes/default.nix | 29 +- .../networking/cluster/kubernetes/kubectl.nix | 30 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/nixops/default.nix | 2 + .../cluster/nixops/poetry-git-overlay.nix | 8 +- .../networking/cluster/nixops/poetry.lock | 183 +- .../cluster/nomad-autoscaler/default.nix | 6 +- .../networking/cluster/octant/default.nix | 10 +- .../networking/cluster/odo/default.nix | 38 + .../networking/cluster/openshift/default.nix | 11 +- .../networking/cluster/sonobuoy/default.nix | 6 +- .../terraform-providers/providers.json | 140 +- .../networking/cluster/terraform/default.nix | 6 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/cluster/velero/default.nix | 8 +- .../networking/cluster/waypoint/default.nix | 6 +- .../networking/cluster/werf/default.nix | 6 +- .../networking/dropbox/default.nix | 4 +- .../networking/flexget/default.nix | 11 +- .../instant-messengers/cinny/default.nix | 4 +- .../deltachat-desktop/default.nix | 8 +- .../instant-messengers/discord/default.nix | 8 +- .../instant-messengers/discord/linux.nix | 4 +- .../element/element-desktop.nix | 35 +- .../element/keytar/default.nix | 4 + .../element/seshat/default.nix | 7 +- .../instant-messengers/fluffychat/default.nix | 52 +- .../instant-messengers/gitter/default.nix | 2 +- .../instant-messengers/gomuks/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 2 +- .../instant-messengers/mikutter/default.nix | 4 +- .../instant-messengers/mm/default.nix | 2 +- .../instant-messengers/rambox/rambox.nix | 3 +- .../instant-messengers/ricochet/default.nix | 2 +- .../instant-messengers/schildichat/pin.json | 11 +- .../schildichat/schildichat-desktop.nix | 12 +- .../schildichat/schildichat-web.nix | 38 +- .../instant-messengers/schildichat/update.sh | 24 +- .../signal-desktop/default.nix | 8 +- .../signalbackup-tools/default.nix | 4 +- ...g-during-gradle-build-inside-Nix-FOD.patch | 35 + .../0002-buildconfig-local-deps-fixes.patch | 60 + .../instant-messengers/signald/default.nix | 39 +- .../signald/gradle-plugin.patch | 19 - .../skypeforlinux/default.nix | 4 +- .../instant-messengers/teamspeak/client.nix | 6 +- .../telegram/tdesktop/default.nix | 4 +- .../telegram/tdesktop/tg_owt.nix | 8 +- .../instant-messengers/tensor/default.nix | 4 +- .../vk-messenger/default.nix | 10 +- .../instant-messengers/wavebox/default.nix | 2 +- .../wire-desktop/default.nix | 6 +- .../instant-messengers/zoom-us/default.nix | 4 +- .../ipfs-migrator/all-migrations.nix | 63 + .../networking/ipfs-migrator/default.nix | 36 +- .../networking/ipfs-migrator/unwrapped.nix | 35 + .../applications/networking/ipfs/default.nix | 6 +- .../networking/irc/catgirl/default.nix | 4 +- .../networking/maestral-qt/default.nix | 6 +- .../evolution/evolution-ews/default.nix | 6 +- .../networking/misc/zammad/0001-nulldb.patch | 15 + .../networking/misc/zammad/default.nix | 137 + .../networking/misc/zammad/gemset.nix | 2834 ++++ .../networking/misc/zammad/package.json | 14 + .../networking/misc/zammad/source.json | 7 + .../networking/misc/zammad/update.nix | 35 + .../networking/misc/zammad/update.sh | 68 + .../networking/misc/zammad/yarn.lock | 2347 ++++ .../networking/misc/zammad/yarn.nix | 2669 ++++ .../networking/mumble/default.nix | 122 +- .../mumble/fix-rnnoise-argument.patch | 16 - .../networking/n8n/node-packages.nix | 300 +- .../networking/nextcloud-client/default.nix | 6 +- .../networking/opsdroid/default.nix | 4 +- .../networking/ostinato/default.nix | 15 +- .../networking/p2p/frostwire/default.nix | 2 +- .../p2p/frostwire/frostwire-bin.nix | 21 +- .../networking/p2p/ktorrent/default.nix | 32 - .../networking/p2p/transgui/default.nix | 10 +- .../applications/networking/pjsip/default.nix | 4 +- .../networking/remote/anydesk/default.nix | 4 +- .../networking/remote/freerdp/default.nix | 4 +- .../networking/remote/remmina/default.nix | 6 +- .../remote/vmware-horizon-client/default.nix | 2 +- .../networking/seafile-client/default.nix | 4 +- .../networking/seaweedfs/default.nix | 4 +- .../networking/shellhub-agent/default.nix | 6 +- .../networking/ssb-patchwork/default.nix | 2 +- .../networking/sync/unison/default.nix | 9 +- .../networking/syncthing/default.nix | 6 +- .../networking/termius/default.nix | 13 +- .../networking/testssl/default.nix | 4 +- .../applications/office/appflowy/default.nix | 11 +- .../applications/office/espanso/default.nix | 1 + .../applications/office/jabref/default.nix | 2 +- .../applications/office/jameica/default.nix | 3 +- .../applications/office/morgen/default.nix | 4 +- .../office/paperless-ng/default.nix | 56 +- .../office/paperwork/openpaperwork-core.nix | 1 + .../office/paperwork/openpaperwork-gtk.nix | 1 + .../office/paperwork/paperwork-gtk.nix | 22 +- .../applications/office/paperwork/src.nix | 4 +- .../applications/office/portfolio/default.nix | 6 +- .../applications/office/pyspread/default.nix | 2 +- .../applications/office/qownnotes/default.nix | 4 +- .../applications/office/skanlite/default.nix | 30 - .../office/softmaker/desktop_items.nix | 90 +- .../applications/office/timeline/default.nix | 3 +- .../applications/office/trilium/default.nix | 2 +- .../pkgs/applications/office/tusk/default.nix | 2 +- .../applications/office/wpsoffice/default.nix | 1 - .../applications/office/zanshin/default.nix | 38 - .../applications/office/zotero/default.nix | 7 +- .../applications/radio/svxlink/default.nix | 2 +- .../pkgs/applications/radio/urh/default.nix | 4 +- .../science/astronomy/gprojector/default.nix | 4 +- .../science/biology/angsd/default.nix | 25 + .../science/biology/bcftools/default.nix | 4 +- .../science/biology/febio-studio/default.nix | 61 + .../febio-studio/febio-studio-cmake.patch | 38 + .../science/biology/last/default.nix | 8 +- .../science/biology/minimap2/default.nix | 3 +- .../science/biology/neuron/default.nix | 2 +- .../science/biology/picard-tools/default.nix | 4 +- .../science/biology/raxml/default.nix | 4 +- .../science/chemistry/d-seams/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 16 +- .../science/chemistry/pymol/default.nix | 12 +- .../science/electronics/diylc/default.nix | 2 +- .../science/electronics/eagle/eagle.nix | 2 +- .../science/electronics/eagle/eagle7.nix | 2 +- .../science/logic/alt-ergo/default.nix | 17 +- .../science/logic/anders/default.nix | 5 +- .../science/logic/coq/default.nix | 12 +- .../science/logic/isabelle/default.nix | 26 +- .../science/logic/key/default.nix | 2 +- .../logic/logisim-evolution/default.nix | 2 +- .../science/logic/logisim/default.nix | 2 +- .../science/logic/tlaplus/tlaps.nix | 8 +- .../science/logic/tlaplus/toolbox.nix | 6 +- .../science/logic/why3/default.nix | 10 +- .../science/logic/workcraft/default.nix | 4 +- .../science/math/geogebra/default.nix | 4 +- .../science/math/getdp/default.nix | 2 +- .../science/math/gmsh/default.nix | 4 +- .../science/math/gurobi/default.nix | 4 +- .../science/math/qalculate-gtk/default.nix | 4 +- .../science/math/sage/default.nix | 6 +- .../applications/science/math/sage/sage.nix | 3 +- .../science/misc/bada-bib/default.nix | 12 +- .../science/misc/cwltool/default.nix | 4 +- .../science/misc/netlogo/default.nix | 2 +- .../molecular-dynamics/gromacs/default.nix | 4 +- .../science/programming/groove/default.nix | 2 +- .../terminal-emulators/alacritty/default.nix | 8 +- .../terminal-emulators/mlterm/default.nix | 6 +- .../rxvt-unicode/default.nix | 2 +- .../terminal-emulators/tilix/default.nix | 4 +- .../terminal-emulators/wayst/default.nix | 9 +- .../terminal-emulators/xterm/default.nix | 4 +- .../version-management/commitizen/default.nix | 43 +- .../version-management/fossil/default.nix | 4 +- .../git-and-tools/gg/default.nix | 25 +- .../gg/skip-broken-revert-tests.patch | 12 - .../git-and-tools/gh/default.nix | 6 +- .../git-and-tools/ghorg/default.nix | 6 +- .../git-and-tools/git-gone/default.nix | 35 +- .../git-and-tools/lucky-commit/default.nix | 6 +- .../git-and-tools/subgit/default.nix | 4 +- .../version-management/git-review/default.nix | 8 +- .../version-management/gitea/default.nix | 4 +- .../version-management/gitkraken/default.nix | 2 +- .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/default.nix | 7 +- .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 20 +- .../gitlab/gitaly/default.nix | 26 +- .../gitlab/gitaly/gemset.nix | 24 +- .../gitlab/gitlab-shell/default.nix | 8 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/remove-hardcoded-locations.patch | 10 + .../version-management/gitlab/rubyEnv/Gemfile | 29 +- .../gitlab/rubyEnv/Gemfile.lock | 172 +- .../gitlab/rubyEnv/gemset.nix | 162 +- .../version-management/got/default.nix | 4 +- .../version-management/mercurial/default.nix | 8 +- .../version-management/redmine/Gemfile | 2 +- .../version-management/redmine/Gemfile.lock | 123 +- .../version-management/redmine/default.nix | 8 +- .../version-management/redmine/gemset.nix | 129 +- .../version-management/smartgithg/default.nix | 14 +- .../applications/video/clapper/default.nix | 4 +- .../applications/video/clipgrab/default.nix | 2 +- .../applications/video/epgstation/update.nix | 2 +- .../video/ffmpeg-normalize/default.nix | 4 +- .../applications/video/filebot/default.nix | 10 +- .../pkgs/applications/video/gpac/default.nix | 4 +- .../applications/video/mirakurun/update.nix | 2 +- .../applications/video/obs-studio/default.nix | 4 +- .../rtabmap/0001-remove-printer-support.patch | 139 + .../applications/video/rtabmap/default.nix | 59 + .../applications/video/shotcut/default.nix | 6 +- .../video/streamlink-twitch-gui/bin.nix | 2 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/crun/default.nix | 5 +- .../virtualization/distrobox/default.nix | 38 + .../virtualization/firecracker/default.nix | 4 +- .../virtualization/libgovirt/default.nix | 36 +- .../looking-glass-client/default.nix | 2 +- .../virtualization/podman/default.nix | 43 +- .../virtualization/podman/wrapper.nix | 22 + .../virtualization/qemu/default.nix | 7 +- .../virtualization/seabios/default.nix | 13 +- .../window-managers/berry/default.nix | 2 +- .../window-managers/i3/balance-workspace.nix | 4 +- .../window-managers/i3/status-rust.nix | 8 +- .../window-managers/i3/swallow.nix | 44 + .../window-managers/jwm/default.nix | 4 +- .../build-fhs-userenv-bubblewrap/env.nix | 2 +- .../build-support/build-fhs-userenv/env.nix | 2 +- .../pkgs/build-support/coq/default.nix | 9 +- .../dotnet/build-dotnet-module/default.nix | 240 +- .../build-dotnet-module/hooks/default.nix | 62 + .../hooks/dotnet-build-hook.sh | 41 + .../hooks/dotnet-check-hook.sh | 33 + .../hooks/dotnet-configure-hook.sh | 32 + .../hooks/dotnet-fixup-hook.sh | 42 + .../hooks/dotnet-install-hook.sh | 42 + .../dotnet/make-nuget-deps/default.nix | 9 + .../dotnet/make-nuget-source/default.nix | 30 + .../pkgs/build-support/fetchurl/default.nix | 5 +- .../pkgs/build-support/fetchzip/default.nix | 8 +- .../pkgs/build-support/flutter/default.nix | 9 +- .../write-darwin-bundle.nix | 29 +- .../make-desktopitem/default.nix | 156 +- .../pkgs/build-support/ocaml/default.nix | 2 + .../pkgs/build-support/ocaml/oasis.nix | 6 +- .../pkgs/build-support/rust/hooks/default.nix | 10 + .../rust/hooks/rust-bindgen-hook.sh | 13 + .../setup-hooks/desktop-to-darwin-bundle.sh | 157 +- .../singularity-tools/default.nix | 4 +- .../pkgs/build-support/writers/default.nix | 38 +- .../pkgs/build-support/writers/test.nix | 27 + .../pkgs/common-updater/generic-updater.nix | 2 +- .../pkgs/common-updater/git-updater.nix | 17 + .../http-two-levels-updater.nix | 19 + .../scripts/list-archive-two-level-versions | 35 - .../scripts/list-archive-two-levels-versions | 54 + .../pkgs/common-updater/scripts/list-git-tags | 49 +- .../execline-man-pages/default.nix | 4 +- .../documentation/s6-man-pages/default.nix | 2 +- .../s6-networking-man-pages/default.nix | 4 +- .../nixpkgs/pkgs/data/fonts/agave/default.nix | 33 +- .../pkgs/data/fonts/andika/default.nix | 4 +- .../pkgs/data/fonts/charis-sil/default.nix | 4 +- .../pkgs/data/fonts/doulos-sil/default.nix | 4 +- .../pkgs/data/fonts/gentium/default.nix | 4 +- .../pkgs/data/fonts/iosevka/update-default.sh | 2 +- .../pkgs/data/fonts/lxgw-wenkai/default.nix | 23 + .../data/fonts/parastoo-fonts/default.nix | 4 +- .../data/fonts/redhat-official/default.nix | 10 +- .../pkgs/data/fonts/sarasa-gothic/default.nix | 4 +- .../pkgs/data/icons/luna-icons/default.nix | 4 +- .../icons/numix-icon-theme-circle/default.nix | 4 +- .../icons/numix-icon-theme-square/default.nix | 4 +- .../data/icons/papirus-icon-theme/default.nix | 4 +- .../data/icons/tela-icon-theme/default.nix | 4 +- .../pkgs/data/misc/osinfo-db/default.nix | 19 +- .../misc/spdx-license-list-data/default.nix | 25 +- .../pkgs/data/misc/v2ray-geoip/default.nix | 6 +- .../data/soundfonts/ydp-grand/default.nix | 23 + .../data/themes/flat-remix-gtk/default.nix | 4 +- .../pkgs/data/themes/marwaita/default.nix | 7 +- .../pkgs/data/themes/nordic/default.nix | 34 +- .../pkgs/data/themes/orchis-theme/default.nix | 4 +- .../pkgs/data/themes/whitesur/default.nix | 41 +- .../desktops/cinnamon/xreader/default.nix | 4 +- .../desktops/gnome/core/evince/default.nix | 6 +- .../gnome/core/gnome-tour/default.nix | 4 +- .../nixpkgs/pkgs/desktops/gnome/default.nix | 6 +- .../gnome/extensions/arcmenu/default.nix | 4 +- .../gnome/extensions/dash-to-dock/default.nix | 6 +- .../desktops/gnome/extensions/extensions.json | 90 +- .../gnome/games/gnome-2048/default.nix | 3 +- .../gnome/games/gnome-mines/default.nix | 4 +- .../desktops/gnome/misc/gpaste/default.nix | 4 +- .../nixpkgs/pkgs/desktops/gnome/update.nix | 38 +- .../nixpkgs/pkgs/desktops/lxqt/default.nix | 3 +- .../nixpkgs/pkgs/desktops/mate/default.nix | 5 +- .../pkgs/desktops/mate/mate-tweak/default.nix | 6 +- .../pantheon/apps/appcenter/default.nix | 12 + .../desktop/elementary-greeter/default.nix | 15 +- .../elementary-greeter/fix-crash.patch | 21 - .../plasma-5/3rdparty/addons/krunner-ssh.nix | 43 + .../3rdparty/kwin/scripts/krohnkite.nix | 4 +- .../pkgs/desktops/plasma-5/default.nix | 1 + .../xfce/applications/orage/default.nix | 5 +- .../xfce/art/xfce4-icon-theme/default.nix | 6 +- .../xfce/art/xfwm4-themes/default.nix | 6 +- .../nixpkgs/pkgs/desktops/xfce/default.nix | 13 +- .../pkgs/desktops/xfce/mkXfceDerivation.nix | 5 +- .../xfce4-cpugraph-plugin/default.nix | 6 +- .../xfce4-embed-plugin/default.nix | 6 +- .../xfce4-eyes-plugin/default.nix | 6 +- .../xfce4-fsguard-plugin/default.nix | 6 +- .../xfce4-genmon-plugin/default.nix | 6 +- .../xfce4-mailwatch-plugin/default.nix | 6 +- .../xfce4-mpc-plugin/default.nix | 6 +- .../xfce4-namebar-plugin/default.nix | 7 +- .../xfce4-notes-plugin/default.nix | 6 +- .../xfce4-sensors-plugin/default.nix | 6 +- .../xfce4-systemload-plugin/default.nix | 6 +- .../xfce4-timer-plugin/default.nix | 6 +- .../xfce4-weather-plugin/default.nix | 6 +- .../xfce4-windowck-plugin/default.nix | 5 +- .../xfce/thunar-plugins/dropbox/default.nix | 4 +- .../beam-modules/elvis-erlang/default.nix | 2 +- .../beam-modules/erlang-ls/default.nix | 2 +- .../compilers/crystal/build-package.nix | 2 +- .../compilers/cudatoolkit/default.nix | 7 + .../development/compilers/elm/default.nix | 3 +- .../development/compilers/flutter/default.nix | 8 +- .../development/compilers/fstar/default.nix | 14 +- .../pkgs/development/compilers/go/1.16.nix | 4 +- .../development/compilers/haxe/default.nix | 2 +- .../compilers/llvm/14/bintools/default.nix | 29 + .../compilers/llvm/14/clang/default.nix | 131 + .../llvm/14/clang/gnu-install-dirs.patch | 50 + .../compilers/llvm/14/clang/purity.patch | 28 + .../compiler-rt/X86-support-extension.patch | 21 + .../llvm/14/compiler-rt/armv7l.patch | 32 + .../llvm/14/compiler-rt/codesign.patch | 33 + .../darwin-targetconditionals.patch | 71 + .../compilers/llvm/14/compiler-rt/default.nix | 126 + .../14/compiler-rt/gnu-install-dirs.patch | 42 + .../llvm/14/compiler-rt/normalize-var.patch | 16 + .../development/compilers/llvm/14/default.nix | 278 + .../compilers/llvm/14/libcxx/default.nix | 89 + .../llvm/14/libcxx/gnu-install-dirs.patch | 85 + .../compilers/llvm/14/libcxxabi/default.nix | 87 + .../llvm/14/libcxxabi/gnu-install-dirs.patch | 46 + .../compilers/llvm/14/libcxxabi/wasm.patch | 16 + .../compilers/llvm/14/libunwind/default.nix | 48 + .../llvm/14/libunwind/gnu-install-dirs.patch | 65 + .../compilers/llvm/14/lld/default.nix | 55 + .../llvm/14/lld/fix-root-src-dir.patch | 13 + .../llvm/14/lld/gnu-install-dirs.patch | 22 + .../compilers/llvm/14/lldb/default.nix | 145 + .../llvm/14/lldb/gnu-install-dirs.patch | 36 + .../compilers/llvm/14/lldb/procfs.patch | 31 + .../compilers/llvm/14/lldb/resource-dir.patch | 13 + .../compilers/llvm/14/llvm/default.nix | 254 + .../llvm/14/llvm/gnu-install-dirs-polly.patch | 102 + .../llvm/14/llvm/gnu-install-dirs.patch | 220 + .../compilers/llvm/14/openmp/default.nix | 55 + .../llvm/14/openmp/fix-find-tool.patch | 54 + .../llvm/14/openmp/gnu-install-dirs.patch | 89 + .../compilers/llvm/git/clang/default.nix | 15 +- .../llvm/git/clang/gnu-install-dirs.patch | 42 +- .../llvm/git/compiler-rt/default.nix | 17 +- .../git/compiler-rt/gnu-install-dirs.patch | 55 + .../compilers/llvm/git/default.nix | 12 +- .../compilers/llvm/git/libcxx/default.nix | 24 +- .../llvm/git/libcxx/gnu-install-dirs.patch | 97 +- .../compilers/llvm/git/libcxxabi/default.nix | 19 +- .../llvm/git/libcxxabi/gnu-install-dirs.patch | 29 +- .../compilers/llvm/git/libunwind/default.nix | 20 +- .../llvm/git/libunwind/gnu-install-dirs.patch | 61 +- .../compilers/llvm/git/lld/default.nix | 23 +- .../llvm/git/lld/fix-root-src-dir.patch | 13 + .../llvm/git/lld/gnu-install-dirs.patch | 58 +- .../compilers/llvm/git/lldb/default.nix | 11 +- .../llvm/git/lldb/gnu-install-dirs.patch | 69 +- .../compilers/llvm/git/llvm/default.nix | 23 +- .../git/llvm/gnu-install-dirs-polly.patch | 17 +- .../llvm/git/llvm/gnu-install-dirs.patch | 271 +- .../compilers/llvm/git/openmp/default.nix | 23 +- .../llvm/git/openmp/fix-find-tool.patch | 54 + .../llvm/git/openmp/gnu-install-dirs.patch | 89 + .../development/compilers/myrddin/default.nix | 1 + .../development/compilers/nim/default.nix | 4 +- .../development/compilers/open-watcom/v2.nix | 13 +- .../compilers/oraclejdk/jdk-linux-base.nix | 2 +- .../purescript/purescript/default.nix | 6 +- .../development/compilers/reason/default.nix | 3 + .../compilers/rust/make-rust-platform.nix | 2 +- .../development/compilers/vala/default.nix | 11 +- .../coq-modules/QuickChick/default.nix | 4 +- .../coq-modules/addition-chains/default.nix | 4 +- .../coq-modules/coq-bits/default.nix | 1 + .../coq-modules/coq-elpi/default.nix | 3 +- .../coq-modules/coqhammer/default.nix | 3 + .../coq-modules/coqtail-math/default.nix | 2 +- .../coq-modules/coquelicot/default.nix | 2 +- .../coq-modules/dpdgraph/default.nix | 2 +- .../coq-modules/fourcolor/default.nix | 2 +- .../development/coq-modules/gaia/default.nix | 2 +- .../coq-modules/gappalib/default.nix | 2 +- .../coq-modules/graph-theory/default.nix | 4 +- .../coq-modules/hierarchy-builder/default.nix | 2 +- .../coq-modules/hydra-battles/default.nix | 2 +- .../coq-modules/interval/default.nix | 6 +- .../development/coq-modules/iris/default.nix | 4 +- .../coq-modules/itauto/default.nix | 2 +- .../mathcomp-real-closed/default.nix | 9 +- .../coq-modules/mathcomp-word/default.nix | 2 +- .../coq-modules/mathcomp-zify/default.nix | 4 +- .../coq-modules/mathcomp/default.nix | 5 +- .../coq-modules/multinomials/default.nix | 2 +- .../coq-modules/odd-order/default.nix | 10 +- .../coq-modules/semantics/default.nix | 3 +- .../coq-modules/simple-io/default.nix | 2 +- .../development/coq-modules/stdpp/default.nix | 4 +- .../development/embedded/platformio/core.nix | 47 +- .../embedded/platformio/default.nix | 4 +- .../embedded/platformio/fix-searchpath.patch | 2 +- .../use-local-spdx-license-list.patch | 2 +- .../embedded/stm32/stm32cubemx/default.nix | 2 +- .../haskell-modules/make-package-set.nix | 15 +- .../pkgs/development/idris-modules/array.nix | 2 +- .../pkgs/development/idris-modules/bi.nix | 2 +- .../development/idris-modules/bifunctors.nix | 2 +- .../idris-modules/build-builtin-package.nix | 10 +- .../idris-modules/build-idris-package.nix | 9 +- .../pkgs/development/idris-modules/bytes.nix | 2 +- .../pkgs/development/idris-modules/canvas.nix | 2 +- .../development/idris-modules/categories.nix | 2 +- .../pkgs/development/idris-modules/coda.nix | 2 +- .../development/idris-modules/comonad.nix | 2 +- .../development/idris-modules/composition.nix | 2 +- .../pkgs/development/idris-modules/config.nix | 2 +- .../development/idris-modules/console.nix | 2 +- .../development/idris-modules/containers.nix | 2 +- .../pkgs/development/idris-modules/cube.nix | 2 +- .../pkgs/development/idris-modules/derive.nix | 2 +- .../development/idris-modules/descncrunch.nix | 2 +- .../pkgs/development/idris-modules/dict.nix | 2 +- .../pkgs/development/idris-modules/dom.nix | 2 +- .../development/idris-modules/electron.nix | 2 +- .../development/idris-modules/eternal.nix | 2 +- .../pkgs/development/idris-modules/farrp.nix | 2 +- .../pkgs/development/idris-modules/free.nix | 2 +- .../pkgs/development/idris-modules/fsm.nix | 2 +- .../pkgs/development/idris-modules/glfw.nix | 2 +- .../development/idris-modules/graphviz.nix | 2 +- .../pkgs/development/idris-modules/hamt.nix | 2 +- .../development/idris-modules/hezarfen.nix | 2 +- .../pkgs/development/idris-modules/hrtime.nix | 2 +- .../pkgs/development/idris-modules/html.nix | 2 +- .../pkgs/development/idris-modules/http.nix | 2 +- .../development/idris-modules/http4idris.nix | 2 +- .../pkgs/development/idris-modules/iaia.nix | 2 +- .../idris-modules/idrishighlighter.nix | 2 +- .../development/idris-modules/idrisscript.nix | 2 +- .../development/idris-modules/ipkgparser.nix | 2 +- .../idris-modules/jheiling-extras.nix | 2 +- .../development/idris-modules/jheiling-js.nix | 2 +- .../pkgs/development/idris-modules/js.nix | 2 +- .../pkgs/development/idris-modules/lens.nix | 2 +- .../development/idris-modules/lightyear.nix | 2 +- .../pkgs/development/idris-modules/logic.nix | 2 +- .../development/idris-modules/mapping.nix | 2 +- .../pkgs/development/idris-modules/mhd.nix | 2 +- .../pkgs/development/idris-modules/pacman.nix | 2 +- .../development/idris-modules/patricia.nix | 2 +- .../idris-modules/permutations.nix | 2 +- .../pkgs/development/idris-modules/pfds.nix | 2 +- .../pkgs/development/idris-modules/pipes.nix | 2 +- .../pkgs/development/idris-modules/posix.nix | 2 +- .../development/idris-modules/quantities.nix | 2 +- .../development/idris-modules/rationals.nix | 2 +- .../idris-modules/recursion_schemes.nix | 2 +- .../development/idris-modules/refined.nix | 2 +- .../pkgs/development/idris-modules/sdl.nix | 2 +- .../pkgs/development/idris-modules/sdl2.nix | 2 +- .../development/idris-modules/semidirect.nix | 2 +- .../development/idris-modules/setoids.nix | 2 +- .../pkgs/development/idris-modules/smproc.nix | 2 +- .../development/idris-modules/snippets.nix | 2 +- .../idris-modules/software_foundations.nix | 2 +- .../development/idris-modules/specdris.nix | 2 +- .../pkgs/development/idris-modules/tap.nix | 2 +- .../pkgs/development/idris-modules/test.nix | 2 +- .../development/idris-modules/tfrandom.nix | 2 +- .../development/idris-modules/tlhydra.nix | 2 +- .../development/idris-modules/tomladris.nix | 2 +- .../pkgs/development/idris-modules/tp.nix | 2 +- .../development/idris-modules/tparsec.nix | 2 +- .../development/idris-modules/transducers.nix | 2 +- .../pkgs/development/idris-modules/trees.nix | 2 +- .../development/idris-modules/union_type.nix | 2 +- .../pkgs/development/idris-modules/vdom.nix | 2 +- .../development/idris-modules/vecspace.nix | 2 +- .../pkgs/development/idris-modules/webgl.nix | 2 +- .../development/idris-modules/wl-pprint.nix | 2 +- .../pkgs/development/idris-modules/wyvern.nix | 2 +- .../pkgs/development/idris-modules/xhr.nix | 2 +- .../pkgs/development/idris-modules/yaml.nix | 2 +- .../pkgs/development/idris-modules/yampa.nix | 2 +- .../development/interpreters/bats/default.nix | 8 +- .../interpreters/clisp/default.nix | 6 +- .../development/interpreters/clisp/hg.nix | 4 +- .../interpreters/clojure/babashka.nix | 4 +- .../interpreters/clojure/default.nix | 4 +- .../dhall/build-dhall-directory-package.nix | 3 +- .../interpreters/duktape/default.nix | 4 +- .../interpreters/erlang/generic-builder.nix | 2 +- .../libraries/accountsservice/default.nix | 63 +- .../libraries/accountsservice/fix-paths.patch | 40 +- .../accountsservice/no-create-dirs.patch | 10 +- .../development/libraries/amdvlk/default.nix | 4 +- .../libraries/arrow-cpp/default.nix | 4 +- .../libraries/avro-c++/default.nix | 4 +- .../development/libraries/babl/default.nix | 17 +- .../development/libraries/bamf/default.nix | 32 +- .../libraries/cmark-gfm/default.nix | 10 +- .../development/libraries/dqlite/default.nix | 2 +- .../development/libraries/drogon/default.nix | 4 +- .../libraries/drumstick/default.nix | 6 +- .../development/libraries/exiv2/default.nix | 9 + .../development/libraries/expat/default.nix | 19 +- .../development/libraries/febio/default.nix | 55 + .../libraries/febio/fix-cmake.patch | 26 + .../development/libraries/flatpak/default.nix | 4 +- .../libraries/flatpak/unset-env-vars.patch | 10 +- .../development/libraries/flite/default.nix | 4 +- .../development/libraries/folly/default.nix | 4 +- .../development/libraries/freetds/default.nix | 4 +- .../development/libraries/gegl/default.nix | 4 +- .../development/libraries/gensio/default.nix | 4 +- .../libraries/gsettings-qt/default.nix | 5 +- .../development/libraries/gvfs/default.nix | 2 + .../libraries/gvm-libs/default.nix | 4 +- .../libraries/highfive/default.nix | 2 +- .../libraries/intel-media-sdk/default.nix | 4 +- .../libraries/kquickimageedit/default.nix | 15 +- .../development/libraries/libbap/default.nix | 4 +- .../libraries/libcouchbase/default.nix | 4 +- .../libraries/libdeltachat/default.nix | 6 +- .../libraries/libfprint/default.nix | 4 +- .../pkgs/development/libraries/libgda/6.x.nix | 15 + .../libraries/libgdata/default.nix | 6 +- .../libgnome-games-support/default.nix | 1 - .../libraries/libktorrent/default.nix | 38 - .../libraries/libmodulemd/default.nix | 6 +- .../libraries/libosinfo/default.nix | 5 +- .../libraries/libpulsar/default.nix | 102 + .../libraries/libraspberrypi/default.nix | 6 +- .../development/libraries/librest/default.nix | 13 +- .../development/libraries/librsb/default.nix | 4 +- .../libraries/libserdes/default.nix | 9 + .../development/libraries/libsigcxx/3.0.nix | 4 +- .../libraries/libsigcxx/default.nix | 4 +- .../libraries/libsmartcols/default.nix | 6 +- .../libraries/libsnark/default.nix | 10 +- .../development/libraries/libspf2/default.nix | 5 +- .../development/libraries/libtsm/default.nix | 4 +- .../development/libraries/libui/default.nix | 21 +- .../libraries/libwbxml/default.nix | 28 + .../development/libraries/libwnck/default.nix | 4 +- .../development/libraries/libxmlb/default.nix | 11 +- .../libxmlb/installed-tests-path.patch | 10 +- .../development/libraries/libyang/default.nix | 6 +- .../development/libraries/live555/default.nix | 4 +- .../development/libraries/mesa/default.nix | 14 +- .../libraries/mimalloc/default.nix | 26 +- .../development/libraries/minixml/default.nix | 4 +- .../development/libraries/mlt/default.nix | 5 +- .../pkgs/development/libraries/mlt/qt-5.nix | 6 +- .../development/libraries/mpich/default.nix | 4 +- .../libraries/mtxclient/default.nix | 4 +- .../development/libraries/nanodbc/default.nix | 39 + .../development/libraries/ncnn/default.nix | 4 +- .../development/libraries/netcdf/default.nix | 4 +- .../development/libraries/ngt/default.nix | 2 +- .../development/libraries/nlopt/default.nix | 5 + .../libraries/notcurses/default.nix | 4 +- .../development/libraries/okapi/default.nix | 4 +- .../development/libraries/olm/default.nix | 4 +- .../libraries/openimagedenoise/default.nix | 4 +- .../development/libraries/pagmo2/default.nix | 7 +- .../development/libraries/pdf2xml/default.nix | 1 + .../libraries/phonon/backends/vlc.nix | 9 +- .../physics/fastjet-contrib/default.nix | 9 +- .../libraries/physics/geant4/datasets.nix | 34 +- .../libraries/physics/hepmc3/default.nix | 4 +- .../libraries/physics/pythia/default.nix | 4 +- .../pipewire/0070-installed-tests-path.patch | 14 +- .../libraries/pipewire/default.nix | 7 +- .../libraries/pipewire/wireplumber.nix | 3 + .../libraries/portmidi/default.nix | 4 +- .../development/libraries/prison/default.nix | 7 +- .../libraries/proj-datumgrid/default.nix | 2 +- .../development/libraries/pugixml/default.nix | 4 +- .../libraries/qimageblitz/default.nix | 14 +- .../libraries/qt-4.x/4.8/default.nix | 23 +- .../qtstyleplugin-kvantum-qt4/default.nix | 12 +- .../development/libraries/rang/default.nix | 8 +- .../libraries/rubberband/default.nix | 1 + .../science/biology/htslib/default.nix | 4 +- .../libraries/science/math/bonmin/default.nix | 51 + .../science/math/clmagma/default.nix | 10 +- .../libraries/science/math/ipopt/default.nix | 29 +- .../science/math/libamplsolver/default.nix | 37 + .../science/math/libhomfly/default.nix | 4 +- .../science/math/or-tools/default.nix | 3 +- .../libraries/science/math/petsc/default.nix | 7 +- .../libraries/science/math/scs/default.nix | 4 +- .../math/suitesparse-graphblas/default.nix | 4 +- .../science/math/suitesparse/4.4.nix | 10 +- .../science/math/trilinos/default.nix | 4 +- .../development/libraries/soil/default.nix | 3 +- .../development/libraries/soprano/default.nix | 27 - .../libraries/soprano/find-virtuoso.patch | 86 - .../libraries/speech-tools/default.nix | 6 +- .../libraries/spice-gtk/default.nix | 2 + .../development/libraries/sqlite/default.nix | 2 +- .../development/libraries/tclx/default.nix | 13 +- .../development/libraries/thrift/default.nix | 4 +- .../libraries/umockdev/default.nix | 4 +- .../development/libraries/uri/default.nix | 2 +- .../pkgs/development/libraries/vte/2.90.nix | 9 +- .../development/libraries/vtk/generic.nix | 10 + .../libraries/webkitgtk/default.nix | 32 +- .../development/libraries/wolfssl/default.nix | 4 +- .../libraries/wxwidgets/2.8/default.nix | 2 +- .../libraries/wxwidgets/2.9/default.nix | 15 +- .../libraries/wxwidgets/3.0/default.nix | 13 +- ...-fix-assertion-using-hide-in-destroy.patch | 0 .../xdg-desktop-portal-gtk/default.nix | 25 +- .../libraries/xdg-desktop-portal/default.nix | 54 +- .../quicklisp-to-nix-output/mmap.nix | 33 + .../quicklisp-to-nix-output/slynk.nix | 30 + .../lisp-modules/quicklisp-to-nix-systems.txt | 2 + .../lisp-modules/quicklisp-to-nix.nix | 22 + .../development/node-packages/default.nix | 11 +- .../node-packages/node-packages.json | 9 +- .../node-packages/node-packages.nix | 5582 ++++---- .../ocaml-modules/apron/default.nix | 5 +- .../ocaml-modules/astring/default.nix | 5 +- .../development/ocaml-modules/atd/default.nix | 4 +- .../development/ocaml-modules/bap/default.nix | 5 +- .../ocaml-modules/batteries/default.nix | 8 +- .../ocaml-modules/benchmark/default.nix | 5 +- .../bigarray-overlap/default.nix | 5 +- .../ocaml-modules/bigstringaf/default.nix | 6 +- .../development/ocaml-modules/biniou/1.0.nix | 5 +- .../ocaml-modules/biniou/default.nix | 2 + .../ocaml-modules/bitv/default.nix | 4 +- .../ocaml-modules/bolt/default.nix | 4 +- .../development/ocaml-modules/bos/default.nix | 6 +- .../development/ocaml-modules/bz2/default.nix | 5 +- .../ocaml-modules/calendar/default.nix | 4 +- .../ocaml-modules/camlimages/default.nix | 5 +- .../ocaml-modules/camlpdf/default.nix | 4 +- .../ocaml-modules/camlzip/default.nix | 4 +- .../ocaml-modules/camomile/0.8.2.nix | 4 +- .../ocaml-modules/camomile/0.8.5.nix | 4 +- .../ocaml-modules/camomile/default.nix | 4 +- .../ocaml-modules/caqti/default.nix | 2 +- .../ocaml-modules/carton/default.nix | 4 +- .../ocaml-modules/cfstream/default.nix | 5 +- .../ocaml-modules/checkseum/default.nix | 6 +- .../development/ocaml-modules/cil/default.nix | 4 +- .../ocaml-modules/cmdliner/default.nix | 2 +- .../ocaml-modules/coin/default.nix | 6 +- .../ocaml-modules/comparelib/default.nix | 3 +- .../ocaml-modules/config-file/default.nix | 4 +- .../ocaml-modules/cpdf/default.nix | 5 +- .../ocaml-modules/cryptgps/default.nix | 4 +- .../development/ocaml-modules/csv/1.5.nix | 4 +- .../ocaml-modules/ctypes/default.nix | 6 +- .../ocaml-modules/digestif/default.nix | 6 + .../ocaml-modules/dolmen/default.nix | 4 +- .../ocaml-modules/dolog/default.nix | 4 +- .../ocaml-modules/dose3/default.nix | 4 +- .../development/ocaml-modules/dum/default.nix | 4 +- .../ocaml-modules/dypgen/default.nix | 4 +- .../ocaml-modules/elina/default.nix | 4 +- .../ocaml-modules/eliom/default.nix | 10 +- .../ocaml-modules/enumerate/default.nix | 4 +- .../ocaml-modules/erm_xml/default.nix | 4 +- .../ocaml-modules/erm_xmpp/default.nix | 5 +- .../development/ocaml-modules/expat/0.9.nix | 5 +- .../ocaml-modules/expat/default.nix | 5 +- .../ocaml-modules/extlib/default.nix | 4 +- .../ocaml-modules/farfadet/default.nix | 5 +- .../development/ocaml-modules/fmt/default.nix | 8 +- .../ocaml-modules/fontconfig/default.nix | 7 +- .../ocaml-modules/fpath/default.nix | 5 +- .../ocaml-modules/frontc/default.nix | 4 +- .../ocaml-modules/functory/default.nix | 4 +- .../ocaml-modules/getopt/default.nix | 4 +- .../development/ocaml-modules/gg/default.nix | 32 +- .../ocaml-modules/gmetadom/default.nix | 7 +- .../ocaml-modules/hacl-star/default.nix | 4 +- .../ocaml-modules/hacl-star/raw.nix | 4 +- .../ocaml-modules/herelib/default.nix | 6 +- .../ocaml-modules/hidapi/default.nix | 5 +- .../ocaml-modules/hmap/default.nix | 5 +- .../development/ocaml-modules/hxd/default.nix | 5 +- .../ocaml-modules/inifiles/default.nix | 4 +- .../ocaml-modules/inotify/default.nix | 6 +- .../ocaml-modules/iso8601/default.nix | 5 +- .../ocaml-modules/janestreet/0.12.nix | 3 +- .../ocaml-modules/janestreet/0.14.nix | 5 + .../ocaml-modules/janestreet/janePackage.nix | 6 +- .../janestreet/janePackage_0_12.nix | 4 +- .../janestreet/janePackage_0_14.nix | 4 +- .../ocaml-modules/javalib/default.nix | 4 +- .../ocaml-modules/jsonm/default.nix | 6 +- .../ocaml-modules/lablgl/default.nix | 3 +- .../ocaml-modules/lablgtk-extras/1.4.nix | 2 +- .../ocaml-modules/lablgtk-extras/default.nix | 2 +- .../ocaml-modules/lablgtk/2.14.0.nix | 4 +- .../ocaml-modules/lablgtk/default.nix | 4 +- .../ocaml-modules/labltk/default.nix | 3 +- .../ocaml-modules/lambda-term/default.nix | 16 +- .../ocaml-modules/llvm/default.nix | 6 +- .../ocaml-modules/logs/default.nix | 6 +- .../ocaml-modules/lua-ml/default.nix | 5 +- .../ocaml-modules/lwt-exit/default.nix | 3 +- .../development/ocaml-modules/lwt/default.nix | 9 +- .../ocaml-modules/macaque/default.nix | 6 +- .../ocaml-modules/magick/default.nix | 6 +- .../development/ocaml-modules/mdx/default.nix | 2 + .../ocaml-modules/merlin-extend/default.nix | 4 +- .../ocaml-modules/mirage-crypto/default.nix | 5 +- .../ocaml-modules/mirage-crypto/ec.nix | 13 +- .../ocaml-modules/mirage-crypto/pk.nix | 4 +- .../ocaml-modules/mirage-crypto/rng-async.nix | 4 +- .../mirage-crypto/rng-mirage.nix | 4 +- .../ocaml-modules/mirage-crypto/rng.nix | 6 +- .../ocaml-modules/mlgmp/default.nix | 5 +- .../ocaml-modules/mlgmpidl/default.nix | 7 +- .../ocaml-modules/mtime/default.nix | 7 +- .../ocaml-modules/mysql/default.nix | 4 +- .../ocaml-modules/nocrypto/default.nix | 4 +- .../ocaml-modules/notty/default.nix | 5 +- .../development/ocaml-modules/num/default.nix | 4 +- .../ocaml-modules/ocaml-cairo/default.nix | 5 +- .../ocaml-modules/ocaml-libvirt/default.nix | 4 +- .../ocaml-migrate-parsetree/1.8.x.nix | 4 + .../ocaml-modules/ocaml-r/default.nix | 6 +- .../ocaml-modules/ocamlfuse/default.nix | 7 +- .../ocaml-modules/ocamlnat/default.nix | 5 +- .../ocaml-modules/ocamlnet/default.nix | 6 +- .../ocaml-modules/ocamlsdl/default.nix | 4 +- .../ocaml-modules/ocb-stubblr/default.nix | 5 +- .../ocaml-modules/ocp-ocamlres/default.nix | 6 +- .../ocaml-modules/ocplib-simplex/default.nix | 5 +- .../ocsigen-deriving/default.nix | 5 +- .../ocaml-modules/ocsigen-start/default.nix | 6 +- .../ocaml-modules/ocsigen-toolkit/default.nix | 4 +- .../ocaml-modules/ocurl/default.nix | 6 +- .../ocaml-modules/odate/default.nix | 4 +- .../development/ocaml-modules/odn/default.nix | 5 +- .../development/ocaml-modules/omd/default.nix | 4 +- .../ocaml-modules/opam-repository/default.nix | 5 +- .../ocaml-modules/otfm/default.nix | 5 +- .../ocaml-modules/otoml/default.nix | 4 +- .../ocaml-modules/ounit/default.nix | 4 +- .../ocaml-modules/pipebang/default.nix | 6 +- .../ocaml-modules/piqi-ocaml/default.nix | 5 +- .../ocaml-modules/piqi/default.nix | 4 +- .../ocaml-modules/ppx_cstubs/default.nix | 7 +- .../ocaml-modules/ppx_deriving/default.nix | 11 +- .../ocaml-modules/ppx_tools/default.nix | 8 +- .../ocaml-modules/printbox/default.nix | 4 +- .../ocaml-modules/prof_spacetime/default.nix | 4 +- .../ocaml-modules/psmt2-frontend/default.nix | 4 +- .../ocaml-modules/ptime/default.nix | 7 +- .../ocaml-modules/ptmap/default.nix | 5 +- .../ocaml-modules/pycaml/default.nix | 47 - .../ocaml-modules/pyml/default.nix | 10 +- .../ocaml-modules/react/default.nix | 5 +- .../ocaml-modules/reactivedata/default.nix | 4 +- .../ocaml-modules/reason-native/cli.nix | 5 +- .../ocaml-modules/reason-native/console.nix | 2 +- .../ocaml-modules/reason-native/dir.nix | 2 +- .../reason-native/file-context-printer.nix | 2 +- .../ocaml-modules/reason-native/fp.nix | 2 +- .../reason-native/pastel-console.nix | 2 +- .../ocaml-modules/reason-native/pastel.nix | 2 +- .../reason-native/qcheck-rely.nix | 2 +- .../ocaml-modules/reason-native/refmterr.nix | 2 +- .../reason-native/rely-junit-reporter.nix | 5 +- .../ocaml-modules/reason-native/rely.nix | 2 +- .../ocaml-modules/rope/default.nix | 9 +- .../ocaml-modules/rresult/default.nix | 5 +- .../ocaml-modules/sawja/default.nix | 4 +- .../ocaml-modules/sedlex/default.nix | 4 +- .../development/ocaml-modules/sha/default.nix | 4 +- .../ocaml-modules/sodium/default.nix | 4 +- .../ocaml-modules/sosa/default.nix | 4 +- .../ocaml-modules/sqlite3EZ/default.nix | 5 +- .../ocaml-modules/stdcompat/default.nix | 5 +- .../ocaml-modules/tezos/legacy-store.nix | 4 +- .../development/ocaml-modules/tezos/lmdb.nix | 4 +- .../tezos/protocol-010-PtGRANAD.nix | 9 +- .../tezos/protocol-011-PtHangz2.nix | 9 +- .../development/ocaml-modules/tezos/store.nix | 4 +- .../ocaml-modules/tezos/validation.nix | 4 +- .../ocaml-modules/toml/default.nix | 2 +- .../ocaml-modules/topkg/default.nix | 2 + .../ocaml-modules/torch/default.nix | 4 +- .../ocaml-modules/tsdl/default.nix | 4 +- .../development/ocaml-modules/twt/default.nix | 4 +- .../ocaml-modules/type_conv/108.08.00.nix | 5 +- .../ocaml-modules/type_conv/109.60.01.nix | 5 +- .../ocaml-modules/type_conv/112.01.01.nix | 6 +- .../ocaml-modules/uchar/default.nix | 4 +- .../ocaml-modules/ulex/default.nix | 5 +- .../ocaml-modules/uucd/default.nix | 5 +- .../ocaml-modules/uucp/default.nix | 5 +- .../ocaml-modules/uuidm/default.nix | 2 +- .../ocaml-modules/uunf/default.nix | 5 +- .../ocaml-modules/uuseg/default.nix | 5 +- .../ocaml-modules/uutf/default.nix | 6 +- .../ocaml-modules/uuuu/default.nix | 4 +- .../development/ocaml-modules/vg/default.nix | 5 +- .../ocaml-modules/wasm/default.nix | 1 + .../ocaml-modules/webbrowser/default.nix | 4 +- .../ocaml-modules/xml-light/default.nix | 4 +- .../ocaml-modules/xmlm/default.nix | 5 +- .../development/ocaml-modules/z3/default.nix | 4 +- .../octave-modules/symbolic/default.nix | 33 +- .../development/pharo/launcher/default.nix | 2 +- .../development/pharo/wrapper/default.nix | 8 +- .../php-packages/composer/default.nix | 4 +- .../php-packages/couchbase/default.nix | 4 +- .../php-packages/grumphp/default.nix | 31 + .../php-packages/mailparse/default.nix | 4 +- .../php-packages/mongodb/default.nix | 4 +- .../php-packages/phing/default.nix | 31 + .../php-packages/phpstan/default.nix | 4 +- .../php-packages/rdkafka/default.nix | 4 +- .../php-packages/redis/default.nix | 4 +- .../php-packages/swoole/default.nix | 4 +- .../python-modules/APScheduler/default.nix | 4 +- .../python-modules/adafruit-io/default.nix | 57 + .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/aesara/default.nix | 65 + .../python-modules/aiodiscover/default.nix | 4 +- .../python-modules/aiogithubapi/default.nix | 4 +- .../python-modules/aiohomekit/default.nix | 6 +- .../python-modules/aiohue/default.nix | 4 +- .../python-modules/aioitertools/default.nix | 17 +- .../python-modules/aiolifx/default.nix | 4 +- .../python-modules/aiolyric/default.nix | 19 +- .../python-modules/aiopvpc/default.nix | 5 + .../python-modules/aiopyarr/default.nix | 4 +- .../python-modules/aioshelly/default.nix | 4 +- .../python-modules/aiowebostv/default.nix | 4 +- .../python-modules/androidtv/default.nix | 4 +- .../python-modules/ansible-runner/default.nix | 4 +- .../python-modules/asn1/default.nix | 4 +- .../python-modules/async-lru/default.nix | 8 +- .../python-modules/asyncsleepiq/default.nix | 33 + .../atlassian-python-api/default.nix | 4 +- .../python-modules/augmax/default.nix | 36 + .../python-modules/awkward/default.nix | 4 +- .../aws-lambda-builders/default.nix | 17 +- .../python-modules/azure-identity/default.nix | 4 +- .../azure-mgmt-batch/default.nix | 4 +- .../azure-mgmt-compute/default.nix | 4 +- .../azure-mgmt-containerregistry/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-datafactory/default.nix | 4 +- .../azure-mgmt-kusto/default.nix | 4 +- .../azure-mgmt-storage/default.nix | 4 +- .../python-modules/b2sdk/default.nix | 10 +- .../python-modules/bandit/default.nix | 4 +- .../python-modules/beartype/default.nix | 34 + .../python-modules/bids-validator/default.nix | 4 +- .../python-modules/binwalk/default.nix | 2 +- .../python-modules/bitarray/default.nix | 4 +- .../python-modules/blinkpy/default.nix | 11 + .../python-modules/buildbot/default.nix | 4 +- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 +- .../python-modules/buildbot/worker.nix | 2 +- .../python-modules/celery/default.nix | 5 + .../python-modules/cerberus/default.nix | 5 + .../python-modules/cfn-lint/default.nix | 4 +- .../python-modules/ciscoconfparse/default.nix | 44 +- .../python-modules/ckcc-protocol/default.nix | 4 +- .../python-modules/cloudsmith-api/default.nix | 4 +- .../python-modules/connexion/default.nix | 4 +- .../python-modules/cons/default.nix | 43 + .../python-modules/cssutils/default.nix | 26 +- .../python-modules/cupy/default.nix | 4 +- .../python-modules/dasbus/default.nix | 21 + .../python-modules/dask/default.nix | 13 +- .../databricks-connect/default.nix | 4 +- .../python-modules/datamodeldict/default.nix | 25 +- .../python-modules/datashader/default.nix | 2 +- .../python-modules/decopatch/default.nix | 4 +- .../python-modules/distributed/default.nix | 22 +- .../django-configurations/default.nix | 4 +- .../django-dynamic-preferences/default.nix | 4 +- .../development/python-modules/django/4.nix | 4 +- .../djangorestframework-simplejwt/default.nix | 4 +- .../python-modules/dropbox/default.nix | 4 +- .../python-modules/elastic-apm/default.nix | 4 +- .../python-modules/elkm1-lib/default.nix | 13 +- .../python-modules/etuples/default.nix | 45 + .../python-modules/fastapi/default.nix | 4 +- .../python-modules/fastcore/default.nix | 4 +- .../python-modules/fastprogress/default.nix | 4 +- .../python-modules/ffmpeg-python/default.nix | 38 +- .../python-modules/fiblary3-fork/default.nix | 51 + .../python-modules/fiona/default.nix | 8 - .../fleep/0001-Fixing-paths-on-tests.patch | 48 + .../python-modules/fleep/default.nix | 36 + .../python-modules/flipr-api/default.nix | 16 +- .../python-modules/flux-led/default.nix | 4 +- .../python-modules/fontparts/default.nix | 4 +- .../python-modules/fsspec/default.nix | 4 +- .../python-modules/furo/default.nix | 4 +- .../garages-amsterdam/default.nix | 15 +- .../python-modules/gcsfs/default.nix | 17 +- .../python-modules/gdown/default.nix | 4 +- .../python-modules/gehomesdk/default.nix | 4 +- .../python-modules/geojson-client/default.nix | 16 +- .../georss-tfs-incidents-client/default.nix | 4 +- .../python-modules/glfw/default.nix | 4 +- .../python-modules/globus-sdk/default.nix | 4 +- .../google-cloud-asset/default.nix | 4 +- .../google-cloud-automl/default.nix | 8 +- .../google-cloud-bigquery/default.nix | 4 +- .../google-cloud-bigtable/default.nix | 10 +- .../google-cloud-datacatalog/default.nix | 37 +- .../google-cloud-dataproc/default.nix | 4 +- .../google-cloud-datastore/default.nix | 4 +- .../google-cloud-dlp/default.nix | 22 +- .../google-cloud-iam/default.nix | 4 +- .../google-cloud-iot/default.nix | 4 +- .../google-cloud-language/default.nix | 4 +- .../google-cloud-monitoring/default.nix | 22 +- .../google-cloud-org-policy/default.nix | 4 +- .../google-cloud-os-config/default.nix | 4 +- .../google-cloud-redis/default.nix | 20 +- .../google-cloud-resource-manager/default.nix | 20 +- .../google-cloud-secret-manager/default.nix | 4 +- .../google-cloud-securitycenter/default.nix | 21 +- .../google-cloud-speech/default.nix | 28 +- .../google-cloud-tasks/default.nix | 4 +- .../google-cloud-texttospeech/default.nix | 4 +- .../google-cloud-trace/default.nix | 4 +- .../google-cloud-translate/default.nix | 8 +- .../default.nix | 4 +- .../google-cloud-vision/default.nix | 20 +- .../default.nix | 4 +- .../google-resumable-media/default.nix | 4 +- .../graphql-subscription-manager/default.nix | 4 +- .../python-modules/gridnet/default.nix | 57 + .../python-modules/gspread/default.nix | 4 +- .../python-modules/hahomematic/default.nix | 4 +- .../python-modules/hass-nabucasa/default.nix | 6 +- .../python-modules/hg-evolve/default.nix | 4 +- .../python-modules/holidays/default.nix | 4 +- .../python-modules/hypothesmith/default.nix | 5 + .../ibm-cloud-sdk-core/default.nix | 4 +- .../python-modules/icnsutil/default.nix | 31 + .../python-modules/identify/default.nix | 4 +- .../python-modules/ihatemoney/default.nix | 3 +- .../python-modules/imap-tools/default.nix | 4 +- .../influxdb-client/default.nix | 12 +- .../python-modules/intellifire4py/default.nix | 6 +- .../python-modules/ipyparallel/default.nix | 9 +- .../python-modules/ipython/default.nix | 8 +- .../python-modules/isbnlib/default.nix | 4 +- .../python-modules/islpy/default.nix | 4 +- .../python-modules/jax/default.nix | 15 + .../jschema-to-python/default.nix | 5 +- .../python-modules/jupyter-lsp/default.nix | 32 + .../jupyter-server-mathjax/default.nix | 4 +- .../python-modules/jupyterlab-lsp/default.nix | 33 + .../python-modules/jupyterlab/default.nix | 4 +- .../kaldi-active-grammar/0001-stub.patch | 26 +- .../kaldi-active-grammar/0002-exec-path.patch | 8 +- .../kaldi-active-grammar/default.nix | 2 + .../karton-config-extractor/default.nix | 13 +- .../karton-mwdb-reporter/default.nix | 20 +- .../python-modules/lark/default.nix | 17 +- .../python-modules/librosa/default.nix | 4 +- .../python-modules/localimport/default.nix | 4 +- .../logical-unification/default.nix | 48 + .../python-modules/maestral/default.nix | 6 +- .../python-modules/mailchecker/default.nix | 4 +- .../python-modules/mariadb/default.nix | 4 +- .../python-modules/mathlibtools/default.nix | 4 +- .../python-modules/matrix-common/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/mido/default.nix | 4 - .../python-modules/minikanren/default.nix | 51 + .../python-modules/minikerberos/default.nix | 4 +- .../python-modules/mlflow/default.nix | 15 +- .../python-modules/monty/default.nix | 4 +- .../python-modules/motionblinds/default.nix | 4 +- .../python-modules/mwdblib/default.nix | 12 +- .../mypy-boto3-builder/default.nix | 4 +- .../python-modules/mypy-boto3-s3/default.nix | 4 +- .../python-modules/neo/default.nix | 4 +- .../python-modules/nextcord/default.nix | 64 + .../python-modules/nextcord/paths.patch | 26 + .../python-modules/nitransforms/default.nix | 4 +- .../python-modules/numba-scipy/default.nix | 40 + .../python-modules/openai/default.nix | 4 +- ...-cmake-find-system-distributed-gtest.patch | 57 + .../0003-cmake-use-system-pybind11.patch | 161 + ...tils.h-conflicts-with-nixpkgs-pybind.patch | 86 + .../python-modules/opensfm/default.nix | 127 + .../python-modules/opensfm/fix-scripts.patch | 41 + .../python-modules/orderedset/default.nix | 3 + .../python-modules/ormar/default.nix | 4 +- .../python-modules/oslo-db/default.nix | 4 +- .../python-modules/panel/default.nix | 37 +- .../python-modules/panel/node/default.nix | 17 - .../python-modules/panel/node/node-env.nix | 573 - .../panel/node/node-packages.nix | 562 - .../python-modules/panel/node/package.json | 27 - .../pc-ble-driver-py/default.nix | 4 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/pg8000/default.nix | 4 +- .../python-modules/pglast/default.nix | 4 +- .../python-modules/pivy/default.nix | 2 +- .../python-modules/plaid-python/default.nix | 8 +- .../python-modules/plexapi/default.nix | 4 +- .../python-modules/plugwise/default.nix | 4 +- .../python-modules/pontos/default.nix | 4 +- .../python-modules/poolsense/default.nix | 2 +- .../python-modules/portpicker/default.nix | 26 +- .../python-modules/pubnub/default.nix | 4 +- .../python-modules/py3status/default.nix | 4 +- .../python-modules/py_scrypt/default.nix | 4 +- .../python-modules/pyamg/default.nix | 23 +- .../python-modules/pycfmodel/default.nix | 5 +- .../python-modules/pychromecast/default.nix | 4 +- .../python-modules/pyctr/default.nix | 24 + .../python-modules/pydeconz/default.nix | 4 +- .../python-modules/pydexcom/default.nix | 4 +- .../python-modules/pyeapi/default.nix | 25 +- .../python-modules/pyefergy/default.nix | 18 +- .../python-modules/pyface/default.nix | 26 +- .../python-modules/pyglet/default.nix | 4 +- .../python-modules/pygmo/default.nix | 77 +- .../python-modules/pyhaversion/default.nix | 4 +- .../python-modules/pyicloud/default.nix | 4 +- .../python-modules/pyisy/default.nix | 4 +- .../python-modules/pymupdf/default.nix | 4 +- .../python-modules/pynetbox/default.nix | 4 +- .../python-modules/pynina/default.nix | 4 +- .../python-modules/pyobihai/default.nix | 12 +- .../python-modules/pyoverkiz/default.nix | 4 +- .../python-modules/pyprecice/default.nix | 26 + .../python-modules/pyrfxtrx/default.nix | 4 +- .../python-modules/pyrogram/default.nix | 4 +- .../python-modules/pyroute2-core/default.nix | 8 +- .../pyroute2-ethtool/default.nix | 8 +- .../python-modules/pyroute2-ipdb/default.nix | 8 +- .../python-modules/pyroute2-ipset/default.nix | 8 +- .../python-modules/pyroute2-ndb/default.nix | 12 +- .../pyroute2-nftables/default.nix | 4 +- .../pyroute2-nslink/default.nix | 8 +- .../pyroute2-protocols/default.nix | 8 +- .../python-modules/pyroute2/default.nix | 17 +- .../python-modules/pysaml2/default.nix | 4 +- .../pysignalclirestapi/default.nix | 37 + .../python-modules/pyskyqremote/default.nix | 6 +- .../python-modules/pyswitchbot/default.nix | 7 +- .../pytest-console-scripts/default.nix | 35 +- .../python-benedict/default.nix | 11 +- .../python-modules/python-efl/default.nix | 11 +- .../python-modules/python-gitlab/default.nix | 4 +- .../python-modules/python-hosts/default.nix | 4 +- .../python-modules/python-izone/default.nix | 4 +- .../python-modules/python-slugify/default.nix | 14 +- .../python-socketio/default.nix | 4 +- .../python-modules/python-songpal/default.nix | 4 +- .../python-modules/python-trovo/default.nix | 32 + .../python-modules/python-vlc/default.nix | 15 +- .../python-modules/pythonfinder/default.nix | 4 +- .../python-modules/pytube/default.nix | 13 +- .../python-modules/pytwitchapi/default.nix | 10 +- .../python-modules/pyuptimerobot/default.nix | 4 +- .../python-modules/pywayland/default.nix | 4 +- .../python-modules/pywizlight/default.nix | 4 +- .../python-modules/pywlroots/default.nix | 4 +- .../python-modules/qimage2ndarray/default.nix | 4 +- .../python-modules/qiskit-finance/default.nix | 4 +- .../qiskit-optimization/default.nix | 4 +- .../python-modules/radios/default.nix | 67 + .../readability-lxml/default.nix | 33 + .../python-modules/renault-api/default.nix | 8 +- .../python-modules/reolink/default.nix | 4 +- .../python-modules/requests-cache/default.nix | 9 +- .../python-modules/rich-rst/default.nix | 33 + .../rki-covid-parser/default.nix | 4 +- .../python-modules/rokuecp/default.nix | 4 +- .../python-modules/rpyc/default.nix | 4 +- .../python-modules/rstcheck/default.nix | 4 +- .../python-modules/sabyenc3/default.nix | 4 +- .../python-modules/samsungtvws/default.nix | 4 +- .../python-modules/scp/default.nix | 4 +- .../python-modules/sentry-sdk/default.nix | 4 +- .../python-modules/shodan/default.nix | 4 +- .../python-modules/simple-di/default.nix | 17 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/slixmpp/default.nix | 4 +- .../python-modules/slowapi/default.nix | 16 +- .../python-modules/snitun/default.nix | 4 +- .../python-modules/soco/default.nix | 4 +- .../python-modules/sopel/default.nix | 4 +- .../python-modules/spacy/default.nix | 4 +- .../python-modules/spacy/legacy.nix | 4 +- .../sphinxcontrib-plantuml/default.nix | 4 +- .../sphinxcontrib-tikz/default.nix | 4 +- .../sphinxext-opengraph/default.nix | 4 +- .../python-modules/spyder/default.nix | 2 +- .../python-modules/sqlite-utils/default.nix | 4 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/stripe/default.nix | 4 +- .../python-modules/striprtf/default.nix | 4 +- .../python-modules/subarulink/default.nix | 4 +- .../python-modules/sybil/default.nix | 6 +- .../python-modules/tappy/default.nix | 2 +- .../teamcity-messages/default.nix | 4 +- .../python-modules/tensorflow/default.nix | 4 +- .../python-modules/testfixtures/default.nix | 20 +- .../python-modules/textual/default.nix | 51 + .../python-modules/tifffile/default.nix | 4 +- .../tifffile/python2-regex-compat.patch | 23 - .../python-modules/tikzplotlib/default.nix | 44 + .../python-modules/timetagger/default.nix | 4 +- .../python-modules/tldextract/default.nix | 17 +- .../torch-tb-profiler/default.nix | 48 + .../python-modules/transitions/default.nix | 10 +- .../python-modules/trimesh/default.nix | 4 +- .../python-modules/ttls/default.nix | 4 +- .../python-modules/twitchapi/default.nix | 48 + .../types-cryptography/default.nix | 29 + .../python-modules/types-enum34/default.nix | 25 + .../types-ipaddress/default.nix | 25 + .../python-modules/types-paramiko/default.nix | 28 + .../python-modules/types-requests/default.nix | 4 +- .../python-modules/types-urllib3/default.nix | 4 +- .../python-modules/uvloop/default.nix | 2 + .../python-modules/videocr/default.nix | 46 + .../python-modules/volvooncall/default.nix | 57 + .../python-modules/wandb/default.nix | 8 +- .../python-modules/weasyprint/default.nix | 4 +- .../python-modules/weconnect-mqtt/default.nix | 6 +- .../python-modules/weconnect/default.nix | 4 +- .../python-modules/whitenoise/default.nix | 16 +- .../python-modules/willow/default.nix | 4 +- .../python-modules/xkcdpass/default.nix | 28 +- .../python-modules/xml2rfc/default.nix | 4 +- .../python-modules/yowsup/default.nix | 33 +- .../yowsup/dependency-fixes.patch | 13 - .../python-modules/ytmusicapi/default.nix | 4 +- .../python-modules/zcs/default.nix | 4 + .../python-modules/zcs/fix-test-yaml.patch | 13 + .../python-modules/zeroconf/default.nix | 4 +- .../python-modules/zfec/default.nix | 4 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zict/default.nix | 4 +- .../zwave-js-server-python/default.nix | 8 +- .../python2-modules/gtkme/default.nix | 36 + .../pkgs/development/tools/alloy/default.nix | 2 +- .../tools/amazon-qldb-shell/default.nix | 7 +- .../tools/analysis/actionlint/default.nix | 4 +- .../tools/analysis/checkov/default.nix | 11 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/pmd/default.nix | 4 +- .../tools/analysis/radare2/default.nix | 4 +- .../development/tools/apktool/default.nix | 4 +- .../development/tools/ashpd-demo/default.nix | 6 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../bazel/bazel-remote/default.nix | 6 +- .../build-managers/leiningen/default.nix | 6 +- .../tools/build-managers/rebar3/default.nix | 2 +- .../tools/build-managers/samurai/default.nix | 15 +- .../build-managers/scala-cli/default.nix | 6 +- .../development/tools/checkmate/default.nix | 6 +- .../development/tools/clj-kondo/default.nix | 4 +- .../tools/cmake-language-server/default.nix | 5 + .../github-runner/default.nix | 9 +- .../gitlab-runner/default.nix | 37 +- .../pkgs/development/tools/convco/default.nix | 6 +- .../development/tools/coursier/default.nix | 4 +- .../tools/database/liquibase/default.nix | 4 +- .../tools/database/prisma-engines/default.nix | 6 +- .../tools/database/sqldeveloper/default.nix | 2 +- .../tools/database/squirrel-sql/default.nix | 2 +- .../pkgs/development/tools/datree/default.nix | 6 +- .../development/tools/ddosify/default.nix | 4 +- .../tools/devpi-client/default.nix | 76 +- .../pkgs/development/tools/dockle/default.nix | 6 +- .../pkgs/development/tools/dprint/default.nix | 6 +- .../development/tools/earthly/default.nix | 6 +- .../development/tools/eclipse-mat/default.nix | 2 +- .../development/tools/electron/default.nix | 48 +- .../pkgs/development/tools/ent/default.nix | 6 +- .../development/tools/esbuild/default.nix | 4 +- .../pkgs/development/tools/frugal/default.nix | 4 +- .../development/tools/go-bindata/default.nix | 4 +- .../development/tools/go-swag/default.nix | 4 +- .../development/tools/go-task/default.nix | 6 +- .../development/tools/gofumpt/default.nix | 6 +- .../pkgs/development/tools/gopls/default.nix | 6 +- .../pkgs/development/tools/gosec/default.nix | 6 +- .../tools/java/visualvm/default.nix | 2 +- .../pkgs/development/tools/jpexs/default.nix | 6 +- .../pkgs/development/tools/jql/default.nix | 6 +- .../pkgs/development/tools/just/default.nix | 26 +- .../pkgs/development/tools/mani/default.nix | 4 +- .../development/tools/mars-mips/default.nix | 2 +- .../development/tools/minizinc/default.nix | 4 +- .../development/tools/misc/ccache/default.nix | 4 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../tools/misc/clojure-lsp/default.nix | 6 +- .../tools/misc/coreboot-toolchain/default.nix | 4 +- .../tools/misc/coreboot-toolchain/stable.nix | 6 +- .../tools/misc/coreboot-toolchain/update.sh | 2 +- .../development/tools/misc/grcov/default.nix | 38 + .../development/tools/misc/hydra/default.nix | 1 + .../development/tools/misc/hydra/eval.patch | 34 + .../development/tools/misc/qtspim/default.nix | 12 +- .../tools/misc/saleae-logic-2/default.nix | 2 +- .../tools/misc/saleae-logic/default.nix | 2 +- .../development/tools/misc/svls/default.nix | 6 +- .../development/tools/misc/texlab/default.nix | 6 +- .../tools/misc/uncrustify/default.nix | 8 +- .../tools/misc/universal-ctags/default.nix | 11 +- .../pkgs/development/tools/mold/default.nix | 4 +- .../tools/ocaml/camlidl/default.nix | 2 +- .../tools/ocaml/camlp5/default.nix | 1 + .../development/tools/ocaml/merlin/4.x.nix | 14 +- .../tools/ocaml/merlin/default.nix | 6 +- .../development/tools/ocaml/oasis/default.nix | 6 +- .../tools/ocaml/obelisk/default.nix | 7 +- .../tools/ocaml/ocamlformat/generic.nix | 16 +- .../tools/ocaml/ocp-index/default.nix | 5 +- .../development/tools/ocaml/utop/default.nix | 7 +- .../tools/omnisharp-roslyn/default.nix | 2 +- .../tools/operator-sdk/default.nix | 6 +- .../pkgs/development/tools/packet/default.nix | 22 +- .../development/tools/picotool/default.nix | 4 +- .../tools/quick-lint-js/default.nix | 4 +- .../tools/react-native-debugger/default.nix | 2 +- .../tools/rust/bindgen/default.nix | 4 +- .../tools/rust/cargo-expand/default.nix | 13 +- .../tools/rust/cargo-llvm-lines/default.nix | 6 +- .../tools/rust/cargo-make/default.nix | 6 +- .../tools/rust/cargo-msrv/default.nix | 6 +- .../tools/rust/cargo-rr/default.nix | 8 +- .../tools/rust/cargo-udeps/default.nix | 6 +- .../tools/rust/cargo-valgrind/default.nix | 6 +- .../tools/rust/duckscript/default.nix | 36 + .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/sqlx-cli/default.nix | 6 +- .../development/tools/scalafmt/default.nix | 4 +- .../tools/scenebuilder/default.nix | 8 +- .../development/tools/scenic-view/default.nix | 4 +- .../development/tools/sentry-cli/default.nix | 6 +- .../pkgs/development/tools/stylua/default.nix | 10 +- .../development/tools/symfony-cli/default.nix | 6 +- .../pkgs/development/tools/winpdb/default.nix | 2 +- .../pkgs/development/tools/wp-cli/default.nix | 33 +- .../yarn2nix-moretea/yarn2nix/default.nix | 2 +- .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/web/deno/default.nix | 6 +- .../pkgs/development/web/flyctl/default.nix | 6 +- .../pkgs/development/web/postman/default.nix | 2 +- .../web/protege-distribution/default.nix | 2 +- .../pkgs/games/90secondportraits/default.nix | 2 +- .../nixpkgs/pkgs/games/abuse/default.nix | 2 +- .../nixpkgs/pkgs/games/alephone/default.nix | 2 +- .../nixpkgs/pkgs/games/angband/default.nix | 4 +- .../pkgs/games/assaultcube/default.nix | 2 +- .../nixpkgs/pkgs/games/ballerburg/default.nix | 3 +- .../pkgs/games/blackshades/default.nix | 4 +- .../pkgs/games/blockattack/default.nix | 5 +- .../nixpkgs/pkgs/games/brogue/default.nix | 3 +- .../pkgs/games/cataclysm-dda/common.nix | 1 + .../pkgs/games/clonehero/fhs-wrapper.nix | 2 +- .../nixpkgs/pkgs/games/dhewm3/default.nix | 2 +- .../nixpkgs/pkgs/games/domination/default.nix | 6 +- .../pkgs/games/duckmarines/default.nix | 2 +- .../nixpkgs/pkgs/games/ecwolf/default.nix | 2 +- .../nixpkgs/pkgs/games/eduke32/default.nix | 2 +- .../nixpkgs/pkgs/games/factorio/default.nix | 3 +- .../pkgs/games/fish-fillets-ng/default.nix | 2 +- .../nixpkgs/pkgs/games/flightgear/default.nix | 2 +- .../nixpkgs/pkgs/games/freedroid/default.nix | 2 +- .../nixpkgs/pkgs/games/freenukum/default.nix | 5 +- .../nixpkgs/pkgs/games/frogatto/default.nix | 4 +- .../pkgs/games/frozen-bubble/default.nix | 2 +- .../nixpkgs/pkgs/games/gnujump/default.nix | 2 +- .../nixpkgs/pkgs/games/gzdoom/default.nix | 2 +- .../nixpkgs/pkgs/games/heroic/default.nix | 4 +- .../nixpkgs/pkgs/games/hyperrogue/default.nix | 2 +- .../nixpkgs/pkgs/games/itch/default.nix | 8 +- .../nixpkgs/pkgs/games/ivan/default.nix | 2 +- .../pkgs/games/lgogdownloader/default.nix | 18 +- .../pkgs/games/lunar-client/default.nix | 4 +- .../nixpkgs/pkgs/games/maelstrom/default.nix | 2 +- .../nixpkgs/pkgs/games/mari0/default.nix | 2 +- .../nixpkgs/pkgs/games/mindustry/default.nix | 1 - .../games/minecraft-servers/versions.json | 6 +- .../nixpkgs/pkgs/games/minecraft/default.nix | 2 +- .../nixpkgs/pkgs/games/minetest/default.nix | 4 +- .../nixpkgs/pkgs/games/mrrescue/default.nix | 2 +- .../nixpkgs/pkgs/games/oh-my-git/default.nix | 2 +- .../nixpkgs/pkgs/games/openjk/default.nix | 4 +- .../pkgs/games/opensupaplex/default.nix | 2 +- .../nixpkgs/pkgs/games/orthorobot/default.nix | 2 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 2 +- .../nixpkgs/pkgs/games/quakespasm/default.nix | 2 +- .../nixpkgs/pkgs/games/randtype/default.nix | 1 + .../pkgs/games/rocksndiamonds/default.nix | 2 +- .../nixpkgs/pkgs/games/rott/default.nix | 2 +- .../nixpkgs/pkgs/games/runelite/default.nix | 3 +- .../pkgs/games/sauerbraten/default.nix | 2 +- .../nixpkgs/pkgs/games/scid-vs-pc/default.nix | 2 +- .../nixpkgs/pkgs/games/scummvm/games.nix | 2 +- .../nixpkgs/pkgs/games/sdlpop/default.nix | 2 +- .../nixpkgs/pkgs/games/sienna/default.nix | 2 +- .../nixpkgs/pkgs/games/starsector/default.nix | 2 +- .../nixpkgs/pkgs/games/steam-tui/default.nix | 6 +- .../nixpkgs/pkgs/games/steam/fhsenv.nix | 83 +- .../pkgs/games/system-syzygy/default.nix | 2 +- .../nixpkgs/pkgs/games/tome2/default.nix | 4 +- .../nixpkgs/pkgs/games/tome4/default.nix | 3 +- .../nixpkgs/pkgs/games/unciv/default.nix | 2 +- .../pkgs/games/unvanquished/default.nix | 12 +- .../nixpkgs/pkgs/games/ut2004/wrapper.nix | 2 +- .../nixpkgs/pkgs/games/vimgolf/Gemfile | 2 + .../nixpkgs/pkgs/games/vimgolf/Gemfile.lock | 19 + .../nixpkgs/pkgs/games/vimgolf/default.nix | 17 + .../nixpkgs/pkgs/games/vimgolf/gemset.nix | 43 + .../pkgs/games/vintagestory/default.nix | 3 +- .../pkgs/games/warzone2100/default.nix | 4 +- .../nixpkgs/pkgs/games/worldofgoo/default.nix | 3 +- .../nixpkgs/pkgs/games/xbill/default.nix | 2 +- .../nixpkgs/pkgs/games/xonotic/default.nix | 4 +- .../nixpkgs/pkgs/misc/cups/filters.nix | 58 +- .../pkgs/misc/drivers/xboxdrv/default.nix | 12 +- .../drivers/xboxdrv/fix-60-sec-delay.patch | 27 + .../pkgs/misc/drivers/xboxdrv/scons-py3.patch | 63 + .../misc/drivers/xboxdrv/scons-v4.2.0.patch | 20 + .../misc/drivers/xboxdrv/xboxdrvctl-py3.patch | 73 + .../nixpkgs/pkgs/misc/lilypond/default.nix | 4 +- .../nixpkgs/pkgs/misc/scrcpy/default.nix | 13 +- .../misc/screensavers/physlock/default.nix | 4 +- .../screensavers/xscreensaver/default.nix | 4 +- .../nixpkgs/pkgs/misc/uboot/default.nix | 16 + .../os-specific/darwin/dockutil/default.nix | 32 + .../os-specific/darwin/moltenvk/default.nix | 6 +- .../pkgs/os-specific/linux/cpuid/default.nix | 4 +- .../os-specific/linux/cryptsetup/default.nix | 2 - .../pkgs/os-specific/linux/dddvb/default.nix | 39 + .../firmware/firmware-updater/default.nix | 4 +- .../firmware/raspberrypi-wireless/default.nix | 11 +- .../linux/firmware/raspberrypi/armstubs.nix | 6 +- .../linux/firmware/raspberrypi/default.nix | 18 +- .../firmware/xow_dongle-firmware/default.nix | 32 + .../os-specific/linux/fscrypt/default.nix | 10 +- .../pkgs/os-specific/linux/jool/default.nix | 1 + .../pkgs/os-specific/linux/jool/source.nix | 4 +- .../linux/kernel/hardened/patches.json | 50 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.nix | 4 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.15.nix | 8 +- .../os-specific/linux/kernel/linux-5.16.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../os-specific/linux/kernel/linux-rpi.nix | 10 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../os-specific/linux/kernel/update-rt.sh | 1 + .../linux/kmod-blacklist-ubuntu/default.nix | 6 +- .../linux/libtraceevent/default.nix | 4 +- .../os-specific/linux/libtracefs/default.nix | 27 +- .../os-specific/linux/lsiutil/default.nix | 9 +- .../os-specific/linux/nvidia-x11/builder.sh | 2 +- .../os-specific/linux/openvswitch/default.nix | 4 +- .../os-specific/linux/pam_p11/default.nix | 5 +- .../linux/qmk-udev-rules/default.nix | 4 +- .../linux/raspberrypi-eeprom/default.nix | 13 +- .../os-specific/linux/rtl88x2bu/default.nix | 10 +- .../os-specific/linux/ryzenadj/default.nix | 4 +- .../os-specific/linux/trace-cmd/default.nix | 4 +- .../pkgs/os-specific/linux/upower/default.nix | 72 +- .../os-specific/linux/usbguard/default.nix | 4 +- .../linux/wpa_supplicant/default.nix | 53 +- .../pkgs/os-specific/linux/xone/default.nix | 39 + third_party/nixpkgs/pkgs/pkgs-lib/formats.nix | 207 + .../nixpkgs/pkgs/servers/adguardhome/bins.nix | 16 +- .../pkgs/servers/adguardhome/default.nix | 2 +- .../nixpkgs/pkgs/servers/bazarr/default.nix | 4 +- .../nixpkgs/pkgs/servers/bird/default.nix | 93 +- .../bird/dont-create-sysconfdir-1.patch | 6 - .../nixpkgs/pkgs/servers/dns/nsd/default.nix | 4 +- .../pkgs/servers/endlessh-go/default.nix | 22 + .../pkgs/servers/ftp/vsftpd/default.nix | 10 +- .../pkgs/servers/gemini/agate/default.nix | 16 +- .../pkgs/servers/headphones/default.nix | 10 +- .../pkgs/servers/headscale/default.nix | 6 +- .../home-assistant/component-packages.nix | 43 +- .../pkgs/servers/home-assistant/default.nix | 34 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/parse-requirements.py | 45 +- .../pkgs/servers/home-assistant/tests.nix | 12 +- .../0001-quiche-update-QUICHE-tar-13949.patch | 2980 ----- ...patch-to-make-it-compile-under-GCC10.patch | 91 - .../pkgs/servers/http/envoy/default.nix | 32 +- .../pkgs/servers/http/pomerium/default.nix | 10 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../dovecot/plugins/fts_xapian/default.nix | 8 +- .../pkgs/servers/matrix-conduit/default.nix | 9 +- .../pkgs/servers/matrix-synapse/default.nix | 10 +- .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../pkgs/servers/misc/gobgpd/default.nix | 6 +- .../misc/oven-media-engine/default.nix | 4 +- .../servers/monitoring/grafana/default.nix | 6 +- .../nagios/plugins/check_ssl_cert.nix | 4 +- .../prometheus/varnish-exporter.nix | 6 +- .../pkgs/servers/moonraker/default.nix | 6 +- .../pkgs/servers/mycorrhiza/default.nix | 6 +- .../pkgs/servers/nosql/cassandra/3.0.nix | 4 +- .../pkgs/servers/nosql/cassandra/3.11.nix | 4 +- .../pkgs/servers/nosql/cassandra/generic.nix | 1 - .../nixpkgs/pkgs/servers/peertube/default.nix | 55 +- .../nixpkgs/pkgs/servers/pim6sd/default.nix | 1 + .../servers/piping-server-rust/default.nix | 6 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 6 +- .../nixpkgs/pkgs/servers/pulseaudio/qpaeq.nix | 4 +- .../pkgs/servers/roon-server/default.nix | 4 +- .../servers/rtsp-simple-server/default.nix | 8 +- .../nixpkgs/pkgs/servers/sabnzbd/default.nix | 4 +- .../pkgs/servers/sickbeard/sickgear.nix | 4 +- .../pkgs/servers/soft-serve/default.nix | 4 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 4 +- .../pkgs/servers/sql/mariadb/default.nix | 5 +- .../pkgs/servers/sql/monetdb/default.nix | 4 +- .../sql/postgresql/ext/timescaledb.nix | 20 +- .../nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix | 46 - .../nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix | 37 - .../nixpkgs/pkgs/servers/swego/default.nix | 6 +- .../pkgs/servers/tailscale/default.nix | 6 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 4 +- .../pkgs/servers/vouch-proxy/default.nix | 7 +- .../pkgs/servers/web-apps/moodle/default.nix | 4 +- .../pkgs/servers/web-apps/shiori/default.nix | 10 +- .../servers/web-apps/wallabag/default.nix | 39 +- .../pkgs/servers/zigbee2mqtt/default.nix | 4 +- .../servers/zigbee2mqtt/node-packages.nix | 2357 ++-- third_party/nixpkgs/pkgs/shells/bash/5.1.nix | 3 + .../nixpkgs/pkgs/shells/oil/default.nix | 4 +- .../nixpkgs/pkgs/shells/rush/default.nix | 4 +- .../pkgs/shells/zsh/pure-prompt/default.nix | 4 +- .../shells/zsh/spaceship-prompt/default.nix | 4 +- .../tools/X11/opentabletdriver/default.nix | 7 +- .../pkgs/tools/X11/opentabletdriver/deps.nix | 2 +- .../pkgs/tools/X11/xbanish/default.nix | 4 +- .../pkgs/tools/admin/aliyun-cli/default.nix | 8 +- .../pkgs/tools/admin/certigo/default.nix | 6 +- .../pkgs/tools/admin/cf-vault/default.nix | 23 + .../pkgs/tools/admin/ejson2env/default.nix | 22 + .../pkgs/tools/admin/eksctl/default.nix | 4 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../tools/admin/fits-cloudctl/default.nix | 4 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 2 +- .../pkgs/tools/admin/pebble/default.nix | 9 +- .../default.nix => tools/admin/pgadmin/3.nix} | 5 +- .../pkgs/tools/admin/pgadmin/default.nix | 163 + .../tools/admin/pgadmin/expose-setup.py.patch | 65 + .../pkgs/tools/admin/pgadmin/package.json | 192 + .../pkgs/tools/admin/pgadmin/yarn.lock | 9809 ++++++++++++++ .../nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix | 10717 ++++++++++++++++ .../nixpkgs/pkgs/tools/admin/pulumi/data.nix | 492 +- .../nixpkgs/pkgs/tools/admin/pulumi/update.sh | 19 +- .../pkgs/tools/admin/stripe-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/syft/default.nix | 6 +- .../tools/admin/synapse-admin/default.nix | 4 +- .../pkgs/tools/admin/trivy/default.nix | 6 +- .../pkgs/tools/admin/winbox/default.nix | 13 +- .../pkgs/tools/archivers/unrar/default.nix | 4 +- .../pkgs/tools/archivers/unshield/default.nix | 5 +- .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../pkgs/tools/audio/midimonster/default.nix | 57 + .../tools/audio/mpd-discord-rpc/default.nix | 6 +- .../pkgs/tools/backup/borgbackup/default.nix | 9 +- .../pkgs/tools/backup/stenc/default.nix | 8 +- .../pkgs/tools/compression/dtrx/default.nix | 4 +- .../pkgs/tools/filesystems/cryfs/default.nix | 7 +- .../pkgs/tools/filesystems/irods/common.nix | 24 +- .../pkgs/tools/filesystems/irods/default.nix | 69 +- .../filesystems/irods/irods_root_path.patch | 22 - .../pkgs/tools/filesystems/lfs/default.nix | 6 +- .../tools/filesystems/tar2ext4/default.nix | 4 +- .../pkgs/tools/games/jpsxdec/default.nix | 2 +- .../pkgs/tools/graphics/agi/default.nix | 4 +- .../tools/graphics/gromit-mpx/default.nix | 6 +- .../pkgs/tools/graphics/icoutils/default.nix | 4 + .../pkgs/tools/graphics/netpbm/default.nix | 6 +- .../pkgs/tools/graphics/resvg/default.nix | 6 +- .../graphics/snapdragon-profiler/default.nix | 6 +- .../graphics/structure-synth/default.nix | 7 +- .../pkgs/tools/graphics/timg/default.nix | 4 +- .../pkgs/tools/graphics/vkBasalt/default.nix | 4 +- .../pkgs/tools/graphics/xcolor/default.nix | 2 +- .../ibus-engines/ibus-m17n/default.nix | 6 +- .../inputmethods/remote-touchpad/default.nix | 6 +- .../pkgs/tools/misc/antimicrox/default.nix | 4 +- .../pkgs/tools/misc/apkeep/default.nix | 6 +- .../pkgs/tools/misc/aquosctl/default.nix | 34 + .../pkgs/tools/misc/asdf-vm/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/bat/default.nix | 6 +- .../pkgs/tools/misc/calamares/default.nix | 4 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../tools/misc/cloud-sql-proxy/default.nix | 6 +- .../pkgs/tools/misc/colord-gtk/default.nix | 11 +- .../pkgs/tools/misc/diffoscope/default.nix | 4 +- .../pkgs/tools/misc/dotter/default.nix | 25 + .../nixpkgs/pkgs/tools/misc/dust/default.nix | 6 +- .../pkgs/tools/misc/esphome/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/fend/default.nix | 6 +- .../pkgs/tools/misc/fselect/default.nix | 6 +- .../pkgs/tools/misc/hakuneko/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/hdf5/default.nix | 14 +- .../pkgs/tools/misc/hdfview/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/hexd/default.nix | 4 +- .../pkgs/tools/misc/interactsh/default.nix | 6 +- .../pkgs/tools/misc/jdiskreport/default.nix | 3 +- .../pkgs/tools/misc/krapslog/default.nix | 6 +- .../tools/misc/lockfile-progs/default.nix | 13 +- .../pkgs/tools/misc/miniserve/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/nncp/default.nix | 4 +- .../misc/opentelemetry-collector/contrib.nix | 11 +- .../tools/misc/osinfo-db-tools/default.nix | 45 +- ...ial-httpd-CLI-move-to-tests-director.patch | 46 +- .../pkgs/tools/misc/ostree/default.nix | 8 +- .../pkgs/tools/misc/ostree/fix-1592.patch | 49 +- .../pkgs/tools/misc/parallel/default.nix | 4 +- .../pkgs/tools/misc/pgbadger/default.nix | 3 +- .../precice-config-visualizer/default.nix | 23 + .../nixpkgs/pkgs/tools/misc/pspg/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/rates/default.nix | 6 +- .../pkgs/tools/misc/remind/default.nix | 4 +- .../pkgs/tools/misc/screen/default.nix | 9 +- .../pkgs/tools/misc/sharedown/default.nix | 2 +- .../pkgs/tools/misc/shellspec/default.nix | 34 + .../nixpkgs/pkgs/tools/misc/smug/default.nix | 24 + .../pkgs/tools/misc/staruml/default.nix | 30 +- .../nixpkgs/pkgs/tools/misc/tmux/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/txr/default.nix | 7 +- .../pkgs/tools/misc/upterm/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/vtm/default.nix | 28 + .../pkgs/tools/misc/vttest/default.nix | 6 +- .../pkgs/tools/misc/wakatime/default.nix | 6 +- .../pkgs/tools/misc/writedisk/default.nix | 29 + .../pkgs/tools/misc/ytarchive/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/ytfzf/default.nix | 4 +- .../pkgs/tools/misc/zellij/default.nix | 12 +- .../tools/networking/aardvark-dns/default.nix | 36 + .../pkgs/tools/networking/amass/default.nix | 6 +- .../tools/networking/boundary/default.nix | 13 +- .../pkgs/tools/networking/boundary/update.sh | 2 + .../pkgs/tools/networking/brook/default.nix | 6 +- .../pkgs/tools/networking/checkip/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 6 +- .../pkgs/tools/networking/davix/default.nix | 4 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../networking/eternal-terminal/default.nix | 4 - .../tools/networking/findomain/default.nix | 6 +- .../pkgs/tools/networking/gobgp/default.nix | 6 +- .../pkgs/tools/networking/godns/default.nix | 6 +- .../pkgs/tools/networking/gping/default.nix | 6 +- .../pkgs/tools/networking/grpcui/default.nix | 6 +- .../pkgs/tools/networking/haproxy/default.nix | 4 +- .../pkgs/tools/networking/httplz/default.nix | 6 +- .../pkgs/tools/networking/i2pd/default.nix | 4 +- .../tools/networking/imapproxy/default.nix | 24 - .../pkgs/tools/networking/kea/default.nix | 4 +- .../tools/networking/mailutils/default.nix | 2 + .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/mubeng/default.nix | 4 +- .../tools/networking/netavark/default.nix | 48 + .../tools/networking/netdiscover/default.nix | 4 +- .../networkmanager/libnma/default.nix | 5 + .../networking/nss-pam-ldapd/default.nix | 6 +- .../pkgs/tools/networking/ocserv/default.nix | 4 +- .../openapi-generator-cli/default.nix | 4 +- .../tools/networking/opendrop/default.nix | 41 + .../tools/networking/opensnitch/daemon.nix | 7 +- .../pkgs/tools/networking/opensnitch/ui.nix | 2 +- .../pkgs/tools/networking/openssh/default.nix | 8 +- .../pkgs/tools/networking/owl/default.nix | 25 + .../tools/networking/p2p/amule/default.nix | 16 +- .../networking/p2p/gtk-gnutella/default.nix | 4 +- .../pkgs/tools/networking/rdap/default.nix | 25 + .../networking/shadowsocks-rust/default.nix | 6 +- .../pkgs/tools/networking/sish/default.nix | 4 +- .../pkgs/tools/networking/socat/default.nix | 5 + .../pkgs/tools/networking/tinyssh/default.nix | 4 +- .../networking/wg-netmanager/default.nix | 13 +- .../pkgs/tools/networking/whois/default.nix | 4 +- .../pkgs/tools/networking/xrootd/default.nix | 4 +- .../pkgs/tools/nix/alejandra/default.nix | 6 +- .../nixpkgs/pkgs/tools/nix/statix/default.nix | 9 +- .../tools/package-management/nfpm/default.nix | 6 +- .../tools/package-management/nix/default.nix | 6 +- .../tools/package-management/pdm/default.nix | 3 + .../tools/security/aiodnsbrute/default.nix | 4 +- .../pkgs/tools/security/bitwarden/default.nix | 2 +- .../security/buttercup-desktop/default.nix | 4 +- .../pkgs/tools/security/certipy/default.nix | 4 +- .../pkgs/tools/security/cfripper/default.nix | 30 +- .../pkgs/tools/security/dismap/default.nix | 6 +- .../pkgs/tools/security/dnsx/default.nix | 6 +- .../pkgs/tools/security/duo-unix/default.nix | 4 +- .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../pkgs/tools/security/fprot/default.nix | 42 - .../pkgs/tools/security/gau/default.nix | 4 +- .../pkgs/tools/security/ghidra/build.nix | 2 +- .../pkgs/tools/security/ghidra/default.nix | 2 +- .../pkgs/tools/security/gitleaks/default.nix | 6 +- .../pkgs/tools/security/gomapenum/default.nix | 6 +- .../pkgs/tools/security/grype/default.nix | 6 +- .../pkgs/tools/security/httpx/default.nix | 6 +- .../pkgs/tools/security/jadx/default.nix | 6 +- .../pkgs/tools/security/jd-gui/default.nix | 6 +- .../pkgs/tools/security/knockpy/default.nix | 4 +- .../tools/security/krunner-pass/default.nix | 24 +- .../pkgs/tools/security/kubescape/default.nix | 4 +- .../tools/security/libmodsecurity/default.nix | 5 + .../tools/security/log4j-sniffer/default.nix | 4 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 40 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 50 +- .../tools/security/minio-certgen/default.nix | 6 +- .../pkgs/tools/security/nuclei/default.nix | 6 +- .../tools/security/open-ecard/default.nix | 2 +- .../security/pinentry-bemenu/default.nix | 4 +- .../tools/security/pomerium-cli/default.nix | 58 + .../tools/security/pwgen-secure/default.nix | 17 +- .../pkgs/tools/security/scallion/default.nix | 36 - .../pkgs/tools/security/scorecard/default.nix | 8 +- .../pkgs/tools/security/signify/default.nix | 6 +- .../pkgs/tools/security/sslscan/default.nix | 4 +- .../pkgs/tools/security/step-cli/default.nix | 6 +- .../pkgs/tools/security/tboot/default.nix | 4 +- .../pkgs/tools/security/terrascan/default.nix | 4 +- .../pkgs/tools/security/witness/default.nix | 42 +- .../pkgs/tools/security/yara/default.nix | 26 +- .../pkgs/tools/system/btop/default.nix | 4 +- .../tools/system/consul-template/default.nix | 6 +- .../system/java-service-wrapper/default.nix | 15 +- .../pkgs/tools/system/logrotate/default.nix | 5 + .../nixpkgs/pkgs/tools/system/lr/default.nix | 2 +- .../pkgs/tools/system/monit/default.nix | 4 +- .../pkgs/tools/system/netdata/default.nix | 6 +- .../tools/system/netdata/fix-protobuf.patch | 23 + .../pkgs/tools/system/pcstat/default.nix | 20 +- .../nixpkgs/pkgs/tools/system/pcstat/deps.nix | 11 - .../pkgs/tools/system/syslog-ng/default.nix | 6 +- .../pkgs/tools/system/thermald/default.nix | 1 + .../pkgs/tools/text/asciigraph/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/diffr/default.nix | 6 +- .../pkgs/tools/text/dirdiff/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/gawk/default.nix | 2 +- .../pkgs/tools/text/hottext/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/igrep/default.nix | 35 + .../nixpkgs/pkgs/tools/text/mark/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/pru/Gemfile | 2 + .../nixpkgs/pkgs/tools/text/pru/Gemfile.lock | 13 + .../nixpkgs/pkgs/tools/text/pru/default.nix | 24 + .../nixpkgs/pkgs/tools/text/pru/gemset.nix | 12 + .../pkgs/tools/text/recode/default.nix | 9 +- .../nixpkgs/pkgs/tools/text/rosie/default.nix | 5 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 4 +- .../pkgs/tools/text/xml/basex/default.nix | 4 +- .../tools/text/xml/html-xml-utils/default.nix | 4 +- .../tools/typesetting/asciidoc/default.nix | 4 +- .../tools/typesetting/pdf2odt/default.nix | 52 +- .../tools/typesetting/tectonic/default.nix | 8 +- .../tools/typesetting/tex/dblatex/default.nix | 2 +- .../pkgs/tools/video/svt-av1/default.nix | 4 +- .../tools/virtualization/awsebcli/default.nix | 137 +- .../tools/virtualization/shipyard/default.nix | 4 +- .../pkgs/tools/wayland/wluma/default.nix | 15 +- .../nixpkgs/pkgs/top-level/aliases.nix | 614 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 376 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 6 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 6 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 15 + .../nixpkgs/pkgs/top-level/php-packages.nix | 4 + .../pkgs/top-level/python-packages.nix | 84 +- .../pkgs/top-level/python2-packages.nix | 2 + .../nixpkgs/pkgs/top-level/qt5-packages.nix | 2 - 2156 files changed, 58830 insertions(+), 19294 deletions(-) create mode 100644 third_party/nixpkgs/.git-blame-ignore-revs create mode 100644 third_party/nixpkgs/lib/tests/modules/emptyValues.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/freeform-submodules.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/optionTypeFile.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/optionTypeMerging.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/raw.nix create mode 100755 third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py create mode 100644 third_party/nixpkgs/nixos/modules/hardware/xone.nix create mode 100644 third_party/nixpkgs/nixos/modules/misc/wordlist.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/databases/virtuoso.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json create mode 100644 third_party/nixpkgs/nixos/modules/services/development/zammad.nix rename third_party/nixpkgs/nixos/modules/services/{misc => home-automation}/zigbee2mqtt.nix (100%) rename third_party/nixpkgs/nixos/modules/services/{misc => matrix}/matrix-synapse-log_config.yaml (100%) create mode 100644 third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.nix rename third_party/nixpkgs/nixos/modules/services/{misc => matrix}/matrix-synapse.xml (85%) delete mode 100644 third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/security/fprot.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/proxmox-lxc.nix create mode 100644 third_party/nixpkgs/nixos/tests/logrotate.nix delete mode 100644 third_party/nixpkgs/nixos/tests/nano.nix create mode 100644 third_party/nixpkgs/nixos/tests/nginx-modsecurity.nix create mode 100644 third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix create mode 100644 third_party/nixpkgs/nixos/tests/pgadmin4.nix create mode 100644 third_party/nixpkgs/nixos/tests/systemd-machinectl.nix create mode 100644 third_party/nixpkgs/nixos/tests/vsftpd.nix create mode 100644 third_party/nixpkgs/nixos/tests/zammad.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/editors/nano/test-with-expect.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/aliases.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/build-vim-plugin.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/deprecated.json (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/generated.nix (92%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/fix-node-paths.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/package.json (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/overrides.nix (99%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/fruzzy/get_version.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/lens-vim/remove_duplicate_g_lens_animate.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/sniprun/fix-paths.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/vim-grammarous/set_default_languagetool.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/readme.md (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update-shell.nix (60%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update.py (87%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-gen-doc-hook.sh (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-plugin-names (99%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-utils.nix (99%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/README.txt (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/addon-info.json (100%) rename third_party/nixpkgs/pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/autoload/nix.vim (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/_maintainers/update-bin-srcs-lib.sh (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/default.nix (87%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/missing_elf_deps.sh (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/package-activation-events.json (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/update_helper.sh (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/default.nix (98%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/language-packs.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/mktplcExtRefToFetchArgs.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/rt-deps-bin-srcs.json (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/update-bin-srcs (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-toolsai-jupyter/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-vsliveshare-vsliveshare/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-vsliveshare-vsliveshare/noop-syslog.c (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/python/default.nix (97%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/python/extract-nuget.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/remote-ssh/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rescript/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rescript/rescript-editor-analysis.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rust-analyzer/build-deps/package.json (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rust-analyzer/default.nix (95%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/terraform/default.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/terraform/fix-terraform-ls.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/updateSettings.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/updateSettingsTest.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/update_installed_exts.sh (96%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/build-deps/package.json (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/cmake-build-extension-only.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/default.nix (95%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/lldb.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/reset-cargo-config.patch (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/update.sh (90%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-utils.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeEnv.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeEnvTest.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeExts2nix.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeWithConfiguration.nix (100%) rename third_party/nixpkgs/pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/wakatime/default.nix (81%) create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vscode/update-shell.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/skanpage/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/ktorrent.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/libktorrent.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/skanlite.nix create mode 100644 third_party/nixpkgs/pkgs/applications/kde/zanshin.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/oil/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/wego/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/all-migrations.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/unwrapped.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/0001-nulldb.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/gemset.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/package.json create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-deps/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/rust/hooks/rust-bindgen-hook.sh create mode 100644 third_party/nixpkgs/pkgs/common-updater/git-updater.nix create mode 100644 third_party/nixpkgs/pkgs/common-updater/http-two-levels-updater.nix delete mode 100755 third_party/nixpkgs/pkgs/common-updater/scripts/list-archive-two-level-versions create mode 100755 third_party/nixpkgs/pkgs/common-updater/scripts/list-archive-two-levels-versions create mode 100644 third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/febio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch rename third_party/nixpkgs/pkgs/{desktops/gnome/misc => development/libraries}/libgnome-games-support/default.nix (96%) delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libktorrent/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/soprano/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch rename third_party/nixpkgs/pkgs/development/libraries/wxwidgets/{ => patches}/0001-fix-assertion-using-hide-in-destroy.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/panel/node/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/panel/node/package.json create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyctr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-cryptography/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-enum34/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-ipaddress/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-paramiko/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/videocr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch create mode 100644 third_party/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/vimgolf/Gemfile create mode 100644 third_party/nixpkgs/pkgs/games/vimgolf/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/games/vimgolf/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/vimgolf/gemset.nix create mode 100644 third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch create mode 100644 third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch create mode 100644 third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch create mode 100644 third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch create mode 100644 third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/sql/virtuoso/6.x.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/sql/virtuoso/7.x.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix rename third_party/nixpkgs/pkgs/{applications/misc/pgadmin/default.nix => tools/admin/pgadmin/3.nix} (95%) create mode 100644 third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch create mode 100644 third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/smug/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/imapproxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/opendrop/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/owl/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/fprot/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/scallion/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/netdata/fix-protobuf.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/system/pcstat/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/igrep/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/pru/Gemfile create mode 100644 third_party/nixpkgs/pkgs/tools/text/pru/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/tools/text/pru/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/pru/gemset.nix diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs new file mode 100644 index 0000000000..4a581f9dce --- /dev/null +++ b/third_party/nixpkgs/.git-blame-ignore-revs @@ -0,0 +1,32 @@ +# This file contains a list of commits that are not likely what you +# are looking for in a blame, such as mass reformatting or renaming. +# You can set this file as a default ignore file for blame by running +# the following command. +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# To temporarily not use this file add +# --ignore-revs-file="" +# to your blame command. +# +# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present. +# To not have to set the option in every repository it is needed in, +# save the following script in your path with the name "git-bblame" +# now you can run +# $ git bblame $FILE +# to use the .git-blame-ignore-revs file if it is present. +# +# #!/usr/bin/env bash +# repo_root=$(git rev-parse --show-toplevel) +# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then +# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@ +# else +# git blame $@ +# fi + + +# nixos/modules/rename: Sort alphabetically +1f71224fe86605ef4cd23ed327b3da7882dad382 + +# nixos: fix module paths in rename.nix +d08ede042b74b8199dc748323768227b88efcf7c diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 79296f6473..44007ca482 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -226,10 +226,10 @@ /pkgs/applications/editors/neovim @jonringer @teto # VimPlugins -/pkgs/misc/vim-plugins @jonringer @softinio +/pkgs/applications/editors/vim/plugins @jonringer # VsCode Extensions -/pkgs/misc/vscode-extensions @jonringer +/pkgs/applications/editors/vscode/extensions @jonringer # Prometheus exporter modules and tests /nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index a3c1ed1b58..c5c10d3e4b 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -142,7 +142,7 @@ "6.topic: vim": - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - - pkgs/misc/vim-plugins/**/* + - pkgs/applications/editors/vim/plugins/**/* - nixos/modules/programs/neovim.nix - pkgs/applications/editors/neovim/**/* diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index 0e3f315bb0..bcb164a04e 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.github/workflows/backport.yml @@ -8,7 +8,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # required to find all branches fetch-depth: 0 diff --git a/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index 67634af51f..c48b04d8c1 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index 28e20d6c94..de49e55ef2 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/labels.yml b/third_party/nixpkgs/.github/workflows/labels.yml index 4d1e2a2a0f..c464f8bf58 100644 --- a/third_party/nixpkgs/.github/workflows/labels.yml +++ b/third_party/nixpkgs/.github/workflows/labels.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/labeler@v3 + - uses: actions/labeler@v4 with: repo-token: ${{ secrets.GITHUB_TOKEN }} sync-labels: true diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index b9181c5f3b..787f553529 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml index 3bdbd7f78f..7d9273ef13 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/nixos-manual.yml b/third_party/nixpkgs/.github/workflows/nixos-manual.yml index e1c5b4dc93..bd70f228d4 100644 --- a/third_party/nixpkgs/.github/workflows/nixos-manual.yml +++ b/third_party/nixpkgs/.github/workflows/nixos-manual.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index b8535fdf95..5ad0db1db5 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -38,7 +38,7 @@ jobs: into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index daa9b6d3c8..a8af04b78b 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -32,7 +32,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index 9de57d6e3d..09d208a621 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -10,7 +10,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 - name: setup id: setup diff --git a/third_party/nixpkgs/doc/builders/packages/steam.section.md b/third_party/nixpkgs/doc/builders/packages/steam.section.md index 0cfc1a2c24..3ce33c9b60 100644 --- a/third_party/nixpkgs/doc/builders/packages/steam.section.md +++ b/third_party/nixpkgs/doc/builders/packages/steam.section.md @@ -56,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## steam-run {#sec-steam-run} -The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with +The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with ``` steam-run ./foo diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md index d5b5f5a601..109d051c01 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). -1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) For example in this case: diff --git a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md index a5155aedaf..9a692104a0 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md @@ -29,7 +29,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, -* `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs, +* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies, +* `extraBuildInputs` (optional), this allows to add more build inputs, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. * `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 9f9ace513c..693ea016e0 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -979,6 +979,31 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` +#### Optional extra dependencies + +Some packages define optional dependencies for additional features. With +`setuptools` this is called `extras_require` and `flit` calls it `extras-require`. A +method for supporting this is by declaring the extras of a package in its +`passthru`, e.g. in case of the package `dask` + +```nix +passthru.extras-require = { + complete = [ distributed ]; +}; +``` + +and letting the package requiring the extra add the list to its dependencies + +```nix +propagatedBuildInputs = [ + ... +] ++ dask.extras-require.complete; +``` + +Note this method is preferred over adding parameters to builders, as that can +result in packages depending on different variants and thereby causing +collisions. + #### `buildPythonApplication` function {#buildpythonapplication-function} The `buildPythonApplication` function is practically the same as diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 56faf636df..e19783e29e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -464,6 +464,8 @@ you of the correct hash. be disabled by setting `dontUseCargoParallelTests`. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. +* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets + `bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`. ### Examples {#examples} diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 4ffd6736e2..a615d585b1 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -309,9 +309,9 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. -Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: +Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: ```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { @@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py +GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. ```sh -./pkgs/misc/vim-plugins/update.py --proc 1 +./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` ## Important repositories {#important-repositories} diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 3e43733ad2..3fead03a46 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -126,7 +126,7 @@ let getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption; + showOption showFiles unknownModule mkOption mkPackageOption; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index f1125aca0a..79d54e4a53 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -138,7 +138,7 @@ rec { # support for that, in turn it's lazy in its values. This means e.g. # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't # start a download when `pkgs` wasn't evaluated. - type = types.lazyAttrsOf types.unspecified; + type = types.lazyAttrsOf types.raw; internal = true; description = "Arguments passed to each module."; }; @@ -151,8 +151,7 @@ rec { }; _module.freeformType = mkOption { - # Disallow merging for now, but could be implemented nicely with a `types.optionType` - type = types.nullOr (types.uniq types.attrs); + type = types.nullOr types.optionType; internal = true; default = null; description = '' diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 590937da5b..e4bb7ad219 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -240,6 +240,11 @@ checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep- checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +# submodules in freeformTypes should have their locations annotated +checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix +# freeformTypes can get merged using `types.type`, including submodules +checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix +checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix ## types.anything # Check that attribute sets are merged recursively @@ -284,6 +289,28 @@ checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-var checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix +## emptyValue's +checkConfigOutput "[ ]" config.list.a ./emptyValues.nix +checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix +checkConfigOutput "null" config.null.a ./emptyValues.nix +checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix +# These types don't have empty values +checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix + +## types.raw +checkConfigOutput "{ foo = ; }" config.unprocessedNesting ./raw.nix +checkConfigOutput "10" config.processedToplevel ./raw.nix +checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix +checkConfigOutput "bar" config.priorities ./raw.nix + +# Test that types.optionType merges types correctly +checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix +checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix + +# Test that types.optionType correctly annotates option locations +checkConfigError 'The option .theOption.nested. in .other.nix. is already declared in .optionTypeFile.nix.' config.theOption.nested ./optionTypeFile.nix + cat < urllib.request.Request: - token = os.getenv("GITHUB_API_TOKEN") + +def make_request(url: str, token=None) -> urllib.request.Request: headers = {} if token is not None: headers["Authorization"] = f"token {token}" @@ -90,6 +94,7 @@ class Repo: self.branch = branch self.alias = alias self.redirect: Dict[str, str] = {} + self.token = "dummy_token" @property def name(self): @@ -132,10 +137,11 @@ class Repo: class RepoGitHub(Repo): def __init__( - self, owner: str, repo: str, branch: str, alias: Optional[str] + self, owner: str, repo: str, branch: str, alias: Optional[str] ) -> None: self.owner = owner self.repo = repo + self.token = None '''Url to the repo''' super().__init__(self.url(""), branch, alias) log.debug("Instantiating github repo %s/%s", self.owner, self.repo) @@ -150,7 +156,7 @@ class RepoGitHub(Repo): @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) + req = make_request(self.url(f"blob/{self.branch}/.gitmodules"), self.token) urllib.request.urlopen(req, timeout=10).close() except urllib.error.HTTPError as e: if e.code == 404: @@ -162,7 +168,7 @@ class RepoGitHub(Repo): @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: commit_url = self.url(f"commits/{self.branch}.atom") - commit_req = make_request(commit_url) + commit_req = make_request(commit_url, self.token) with urllib.request.urlopen(commit_req, timeout=10) as req: self._check_for_redirect(commit_url, req) xml = req.read() @@ -291,15 +297,41 @@ class Editor: """To fill the cache""" return get_current_plugins(self) - def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: - return load_plugin_spec(plugin_file) + def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]: + plugins = [] + with open(plugin_file) as f: + for line in f: + if line.startswith("#"): + continue + plugin = parse_plugin_line(config, line) + plugins.append(plugin) + return plugins def generate_nix(self, plugins, outfile: str): '''Returns nothing for now, writes directly to outfile''' raise NotImplementedError() - def get_update(self, input_file: str, outfile: str, proc: int): - return get_update(input_file, outfile, proc, editor=self) + def get_update(self, input_file: str, outfile: str, config: FetchConfig): + cache: Cache = Cache(self.get_current_plugins(), self.cache_file) + _prefetch = functools.partial(prefetch, cache=cache) + + def update() -> dict: + plugin_names = self.load_plugin_spec(config, input_file) + + try: + pool = Pool(processes=config.proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() + + plugins, redirects = check_results(results) + + self.generate_nix(plugins, outfile) + + return redirects + + return update + @property def attr_path(self): @@ -345,7 +377,15 @@ class Editor: dest="proc", type=int, default=30, - help="Number of concurrent processes to spawn. Export GITHUB_API_TOKEN allows higher values.", + help="Number of concurrent processes to spawn. Setting --github-token allows higher values.", + ) + parser.add_argument( + "--github-token", + "-t", + type=str, + default=os.getenv("GITHUB_API_TOKEN"), + help="""Allows to set --proc to higher values. + Uses GITHUB_API_TOKEN environment variables as the default value.""", ) parser.add_argument( "--no-commit", "-n", action="store_true", default=False, @@ -414,8 +454,8 @@ def prefetch_plugin( ) -def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line)) +def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line)) return plugin @@ -465,7 +505,7 @@ def make_repo(uri, branch, alias) -> Repo: repo = Repo(uri.strip(), branch, alias) return repo -def parse_plugin_line(line: str) -> PluginDesc: +def parse_plugin_line(config: FetchConfig, line: str) -> PluginDesc: branch = "HEAD" alias = None uri = line @@ -476,21 +516,11 @@ def parse_plugin_line(line: str) -> PluginDesc: uri, branch = uri.split("@") repo = make_repo(uri.strip(), branch.strip(), alias) + repo.token = config.github_token return PluginDesc(repo, branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[PluginDesc]: - plugins = [] - with open(plugin_file) as f: - for line in f: - if line.startswith("#"): - continue - plugin = parse_plugin_line(line) - plugins.append(plugin) - return plugins - - def get_cache_path(cache_file_name: str) -> Optional[Path]: xdg_cache = os.environ.get("XDG_CACHE_HOME", None) if xdg_cache is None: @@ -556,6 +586,7 @@ def prefetch( def rewrite_input( + config: FetchConfig, input_file: Path, deprecated: Path, redirects: Dict[str, str] = None, @@ -573,8 +604,8 @@ def rewrite_input( with open(deprecated, "r") as f: deprecations = json.load(f) for old, new in redirects.items(): - old_plugin = fetch_plugin_from_pluginline(old) - new_plugin = fetch_plugin_from_pluginline(new) + old_plugin = fetch_plugin_from_pluginline(config, old) + new_plugin = fetch_plugin_from_pluginline(config, new) if old_plugin.normalized_name != new_plugin.normalized_name: deprecations[old_plugin.normalized_name] = { "new": new_plugin.normalized_name, @@ -600,40 +631,21 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: print("no changes in working tree to commit") -def get_update(input_file: str, outfile: str, proc: int, editor: Editor): - cache: Cache = Cache(editor.get_current_plugins(), editor.cache_file) - _prefetch = functools.partial(prefetch, cache=cache) - - def update() -> dict: - plugin_names = editor.load_plugin_spec(input_file) - - try: - pool = Pool(processes=proc) - results = pool.map(_prefetch, plugin_names) - finally: - cache.store() - - plugins, redirects = check_results(results) - - editor.generate_nix(plugins, outfile) - - return redirects - - return update - def update_plugins(editor: Editor, args): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" log.setLevel(LOG_LEVELS[args.debug]) log.info("Start updating plugins") - update = editor.get_update(args.input_file, args.outfile, args.proc) + fetch_config = FetchConfig(args.proc, args.github_token) + update = editor.get_update(args.input_file, args.outfile, fetch_config) redirects = update() - editor.rewrite_input(args.input_file, editor.deprecated, redirects) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects) autocommit = not args.no_commit + nixpkgs_repo = None if autocommit: nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) @@ -648,9 +660,9 @@ def update_plugins(editor: Editor, args): ) for plugin_line in args.add_plugins: - editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",)) update() - plugin = fetch_plugin_from_pluginline(plugin_line) + plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line) if autocommit: commit( nixpkgs_repo, diff --git a/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py b/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py new file mode 100755 index 0000000000..5d9398feaa --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py @@ -0,0 +1,202 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix +""" +A program to remove old aliases or convert old aliases to throws +Example usage: +./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix + +Check this file with mypy after every change! +$ mypy --strict maintainers/scripts/remove-old-aliases.py +""" +import argparse +import shutil +import subprocess +from datetime import date as datetimedate +from datetime import datetime +from pathlib import Path + + +def process_args() -> argparse.Namespace: + """process args""" + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument( + "--year", required=True, type=int, help="operate on aliases older than $year" + ) + arg_parser.add_argument( + "--month", + type=int, + default=1, + help="operate on aliases older than $year-$month", + ) + arg_parser.add_argument("--file", required=True, type=Path, help="alias file") + arg_parser.add_argument( + "--dry-run", action="store_true", help="don't modify files, only print results" + ) + return arg_parser.parse_args() + + +def get_date_lists( + txt: list[str], cutoffdate: datetimedate +) -> tuple[list[str], list[str], list[str]]: + """get a list of lines in which the date is older than $cutoffdate""" + date_older_list: list[str] = [] + date_older_throw_list: list[str] = [] + date_sep_line_list: list[str] = [] + + for lineno, line in enumerate(txt, start=1): + line = line.rstrip() + my_date = None + for string in line.split(): + string = string.strip(":") + try: + # strip ':' incase there is a string like 2019-11-01: + my_date = datetime.strptime(string, "%Y-%m-%d").date() + except ValueError: + try: + my_date = datetime.strptime(string, "%Y-%m").date() + except ValueError: + continue + + if my_date is None or my_date > cutoffdate: + continue + + if "=" not in line: + date_sep_line_list.append(f"{lineno} {line}") + # 'if' lines could be complicated + elif "if " in line and "if =" not in line: + print(f"RESOLVE MANUALLY {line}") + elif "throw" in line: + date_older_throw_list.append(line) + else: + date_older_list.append(line) + + return ( + date_older_list, + date_sep_line_list, + date_older_throw_list, + ) + + +def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: + """convert a list of lines to throws""" + converted_list = [] + for line in date_older_list.copy(): + indent: str = " " * (len(line) - len(line.lstrip())) + before_equal = "" + after_equal = "" + try: + before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2)) + except ValueError as err: + print(err, line, "\n") + date_older_list.remove(line) + continue + + alias = before_equal.strip() + after_equal_list = [x.strip(";:") for x in after_equal.split()] + + converted = ( + f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" + f" '{after_equal_list.pop(0)}'\";" + f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' + ) + converted_list.append((line, converted)) + + return converted_list + + +def generate_text_to_write( + txt: list[str], + date_older_list: list[str], + converted_to_throw: list[tuple[str, str]], + date_older_throw_list: list[str], +) -> list[str]: + """generate a list of text to be written to the aliasfile""" + text_to_write: list[str] = [] + for line in txt: + text_to_append: str = "" + if converted_to_throw: + for tupl in converted_to_throw: + if line == tupl[0]: + text_to_append = f"{tupl[1]}\n" + if line not in date_older_list and line not in date_older_throw_list: + text_to_append = f"{line}\n" + if text_to_append: + text_to_write.append(text_to_append) + + return text_to_write + + +def write_file( + aliasfile: Path, + text_to_write: list[str], +) -> None: + """write file""" + temp_aliasfile = Path(f"{aliasfile}.raliases") + with open(temp_aliasfile, "w", encoding="utf-8") as far: + for line in text_to_write: + far.write(line) + print("\nChecking the syntax of the new aliasfile") + try: + subprocess.run( + ["nix-instantiate", "--eval", temp_aliasfile], + check=True, + stdout=subprocess.DEVNULL, + ) + except subprocess.CalledProcessError: + print( + "\nSyntax check failed,", + "there may have been a line which only has\n" + 'aliasname = "reason why";\n' + "when it should have been\n" + 'aliasname = throw "reason why";', + ) + temp_aliasfile.unlink() + return + shutil.move(f"{aliasfile}.raliases", aliasfile) + print(f"{aliasfile} modified! please verify with 'git diff'.") + + +def main() -> None: + """main""" + args = process_args() + + aliasfile = Path(args.file).absolute() + cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date() + + txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines() + + date_older_list: list[str] = [] + date_sep_line_list: list[str] = [] + date_older_throw_list: list[str] = [] + + date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists( + txt, cutoffdate + ) + + converted_to_throw: list[tuple[str, str]] = [] + converted_to_throw = convert_to_throw(date_older_list) + + if date_older_list: + print(" Will be converted to throws. ".center(100, "-")) + for l_n in date_older_list: + print(l_n) + + if date_older_throw_list: + print(" Will be removed. ".center(100, "-")) + for l_n in date_older_throw_list: + print(l_n) + + if date_sep_line_list: + print(" On separate line, resolve manually. ".center(100, "-")) + for l_n in date_sep_line_list: + print(l_n) + + if not args.dry_run: + text_to_write = generate_text_to_write( + txt, date_older_list, converted_to_throw, date_older_throw_list + ) + write_file(aliasfile, text_to_write) + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/maintainers/scripts/update.nix b/third_party/nixpkgs/maintainers/scripts/update.nix index d881d68301..1a2f06c73a 100755 --- a/third_party/nixpkgs/maintainers/scripts/update.nix +++ b/third_party/nixpkgs/maintainers/scripts/update.nix @@ -147,7 +147,7 @@ let to run update script for specific package, or - % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))' + % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")' to run update script for all packages matching given predicate, or diff --git a/third_party/nixpkgs/maintainers/scripts/update.py b/third_party/nixpkgs/maintainers/scripts/update.py index 06b12a0ee0..07e0b5c683 100644 --- a/third_party/nixpkgs/maintainers/scripts/update.py +++ b/third_party/nixpkgs/maintainers/scripts/update.py @@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra async with merge_lock: await check_subprocess('git', 'add', *change['files'], cwd=worktree) commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + if 'commitMessage' in change: + commit_message = change['commitMessage'] + elif 'commitBody' in change: + commit_message = commit_message + '\n\n' + change['commitBody'] await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree) await check_subprocess('git', 'cherry-pick', branch) diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index c586254d70..4e410b5914 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -50,6 +50,7 @@ with lib.maintainers; { DianaOlympos gleber happysalada + minijackson yurrriq ]; scope = "Maintain BEAM-related packages and modules."; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index fff06e1ea5..819fc6d891 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -145,26 +145,26 @@ As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file per display manager backend (sddm, gdm \...). -There are two approach to this module structure: +There are two approaches we could take with this module structure: -- Managing the display managers independently by adding an enable +- Configuring the display managers independently by adding an enable option to every display manager module backend. (NixOS) -- Managing the display managers in the central module by adding an - option to select which display manager backend to use. +- Configuring the display managers in the central module by adding + an option to select which display manager backend to use. Both approaches have problems. Making backends independent can quickly become hard to manage. For -display managers, there can be only one enabled at a time, but the type -system can not enforce this restriction as there is no relation between -each backend `enable` option. As a result, this restriction has to be -done explicitely by adding assertions in each display manager backend -module. +display managers, there can only be one enabled at a time, but the +type system cannot enforce this restriction as there is no relation +between each backend's `enable` option. As a result, this restriction +has to be done explicitly by adding assertions in each display manager +backend module. -On the other hand, managing the display managers backends in the central -module will require to change the central module option every time a new -backend is added or removed. +On the other hand, managing the display manager backends in the +central module will require changing the central module option every +time a new backend is added or removed. By using extensible option types, it is possible to create a placeholder option in the central module @@ -175,7 +175,7 @@ and to extend it in each backend module As a result, `displayManager.enable` option values can be added without changing the main service module file and the type system automatically -enforce that there can only be a single display manager enabled. +enforces that there can only be a single display manager enabled. ::: {#ex-option-declaration-eot-service .example} ::: {.title} diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md index 56ffa8e9d7..c34ac0367c 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md @@ -16,9 +16,9 @@ merging is handled. `types.path` -: A filesystem path, defined as anything that when coerced to a string - starts with a slash. Even if derivations can be considered as path, - the more specific `types.package` should be preferred. +: A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered as + paths, the more specific `types.package` should be preferred. `types.package` @@ -63,6 +63,24 @@ merging is handled. ``` ::: +`types.raw` + +: A type which doesn't do any checking, merging or nested evaluation. It + accepts a single arbitrary value that is not recursed into, making it + useful for values coming from outside the module system, such as package + sets or arbitrary data. Options of this type are still evaluated according + to priorities and conditionals, so `mkForce`, `mkIf` and co. still work on + the option value itself, but not for any value nested within it. This type + should only be used when checking, merging and nested evaluation are not + desirable. + +`types.optionType` + +: The type of an option's type. Its merging operation ensures that nested + options have the correct file location annotated, and that if possible, + multiple option definitions are correctly merged together. The main use + case is as the type of the `_module.freeformType` option. + `types.attrs` : A free-form attribute set. diff --git a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md index 58a3d8448a..f9bb6ff9cc 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md @@ -66,6 +66,45 @@ have a predefined type and string generator already declared under and returning a set with TOML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). +`pkgs.formats.elixirConf { elixir ? pkgs.elixir }` + +: A function taking an attribute set with values + + `elixir` + + : The Elixir package which will be used to format the generated output + + It returns a set with Elixir-Config-specific attributes `type`, `lib`, and + `generate` as specified [below](#pkgs-formats-result). + + The `lib` attribute contains functions to be used in settings, for + generating special Elixir values: + + `mkRaw elixirCode` + + : Outputs the given string as raw Elixir code + + `mkGetEnv { envVariable, fallback ? null }` + + : Makes the configuration fetch an environment variable at runtime + + `mkAtom atom` + + : Outputs the given string as an Elixir atom, instead of the default + Elixir binary string. Note: lowercase atoms still needs to be prefixed + with `:` + + `mkTuple array` + + : Outputs the given array as an Elixir tuple, instead of the default + Elixir list + + `mkMap attrset` + + : Outputs the given attribute set as an Elixir map, instead of the + default Elixir keyword list + + ::: {#pkgs-formats-result} These functions all return an attribute set with these values: ::: @@ -74,6 +113,12 @@ These functions all return an attribute set with these values: : A module system type representing a value of the format +`lib` + +: Utility functions for convenience, or special interactions with the format. + This attribute is optional. It may contain inside a `types` attribute + containing types specific to this format. + `generate` *`filename jsonValue`* : A function that can render a value of the format to a file. Returns diff --git a/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md b/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md index d477f2c860..bd4fe9e670 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md @@ -41,17 +41,18 @@ checks: `RefuseManualStop` in the `[Unit]` section, and `X-OnlyManualStart` in the `[Unit]` section. - - The rest of the behavior is decided whether the unit has `X-StopIfChanged` - in the `[Service]` section set (exposed via + - Further behavior depends on the unit having `X-StopIfChanged` in the + `[Service]` section set to `true` (exposed via [systemd.services.\.stopIfChanged](#opt-systemd.services)). This is set to `true` by default and must be explicitly turned off if not wanted. If the flag is enabled, the unit is **stop**ped and then **start**ed. If not, the unit is **restart**ed. The goal of the flag is to make sure that the new unit never runs in the old environment which is still in place - before the activation script is run. + before the activation script is run. This behavior is different when the + service is socket-activated, as outlined in the following steps. - The last thing that is taken into account is whether the unit is a service - and socket-activated. Due to a bug, this is currently only done when - `X-StopIfChanged` is set. If the unit is socket-activated, the socket is - stopped and started, and the service is stopped and to be started by socket - activation. + and socket-activated. If `X-StopIfChanged` is **not** set, the service + is **restart**ed with the others. If it is set, both the service and the + socket are **stop**ped and the socket is **start**ed, leaving socket + activation to start the service when it's needed. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml index 0eeffae628..554705e2e4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -215,21 +215,22 @@ lib.mkOption { manager backend (sddm, gdm ...). - There are two approach to this module structure: + There are two approaches we could take with this module + structure: - Managing the display managers independently by adding an - enable option to every display manager module backend. - (NixOS) + Configuring the display managers independently by adding + an enable option to every display manager module + backend. (NixOS) - Managing the display managers in the central module by - adding an option to select which display manager backend - to use. + Configuring the display managers in the central module + by adding an option to select which display manager + backend to use. @@ -238,16 +239,16 @@ lib.mkOption { Making backends independent can quickly become hard to - manage. For display managers, there can be only one enabled - at a time, but the type system can not enforce this - restriction as there is no relation between each backend + manage. For display managers, there can only be one enabled + at a time, but the type system cannot enforce this + restriction as there is no relation between each backend’s enable option. As a result, this - restriction has to be done explicitely by adding assertions + restriction has to be done explicitly by adding assertions in each display manager backend module. - On the other hand, managing the display managers backends in - the central module will require to change the central module + On the other hand, managing the display manager backends in + the central module will require changing the central module option every time a new backend is added or removed. @@ -268,7 +269,7 @@ lib.mkOption { As a result, displayManager.enable option values can be added without changing the main service module - file and the type system automatically enforce that there + file and the type system automatically enforces that there can only be a single display manager enabled. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml index 76ffb6f837..e16453df51 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml @@ -30,10 +30,10 @@ - A filesystem path, defined as anything that when coerced to - a string starts with a slash. Even if derivations can be - considered as path, the more specific - types.package should be preferred. + A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered + as paths, the more specific types.package + should be preferred. @@ -92,6 +92,39 @@ + + + types.raw + + + + A type which doesn’t do any checking, merging or nested + evaluation. It accepts a single arbitrary value that is not + recursed into, making it useful for values coming from + outside the module system, such as package sets or arbitrary + data. Options of this type are still evaluated according to + priorities and conditionals, so mkForce, + mkIf and co. still work on the option + value itself, but not for any value nested within it. This + type should only be used when checking, merging and nested + evaluation are not desirable. + + + + + + types.optionType + + + + The type of an option’s type. Its merging operation ensures + that nested options have the correct file location + annotated, and that if possible, multiple option definitions + are correctly merged together. The main use case is as the + type of the _module.freeformType option. + + + types.attrs diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml index c9430b7757..746011a2d0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -137,6 +137,97 @@ + + + pkgs.formats.elixirConf { elixir ? pkgs.elixir } + + + + A function taking an attribute set with values + + + + + elixir + + + + The Elixir package which will be used to format the + generated output + + + + + + It returns a set with Elixir-Config-specific attributes + type, lib, and + generate as specified + below. + + + The lib attribute contains functions to + be used in settings, for generating special Elixir values: + + + + + mkRaw elixirCode + + + + Outputs the given string as raw Elixir code + + + + + + mkGetEnv { envVariable, fallback ? null } + + + + Makes the configuration fetch an environment variable + at runtime + + + + + + mkAtom atom + + + + Outputs the given string as an Elixir atom, instead of + the default Elixir binary string. Note: lowercase + atoms still needs to be prefixed with + : + + + + + + mkTuple array + + + + Outputs the given array as an Elixir tuple, instead of + the default Elixir list + + + + + + mkMap attrset + + + + Outputs the given attribute set as an Elixir map, + instead of the default Elixir keyword list + + + + + + These functions all return an attribute set with these values: @@ -152,6 +243,19 @@ + + + lib + + + + Utility functions for convenience, or special interactions + with the format. This attribute is optional. It may contain + inside a types attribute containing types + specific to this format. + + + generate diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml index a6a654042f..57c4754c00 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/unit-handling.section.xml @@ -88,9 +88,10 @@ - The rest of the behavior is decided whether the unit has + Further behavior depends on the unit having X-StopIfChanged in the - [Service] section set (exposed via + [Service] section set to + true (exposed via systemd.services.<name>.stopIfChanged). This is set to true by default and must be explicitly turned off if not wanted. If the flag is @@ -100,17 +101,22 @@ is restarted. The goal of the flag is to make sure that the new unit never runs in the old environment which is still in place before the - activation script is run. + activation script is run. This behavior is different when + the service is socket-activated, as outlined in the + following steps. The last thing that is taken into account is whether the - unit is a service and socket-activated. Due to a bug, this - is currently only done when - X-StopIfChanged is set. If the unit is - socket-activated, the socket is stopped and started, and the - service is stopped and to be started by socket activation. + unit is a service and socket-activated. If + X-StopIfChanged is + not set, the service is + restarted with the + others. If it is set, both the service and the socket are + stopped and the socket is + started, leaving socket + activation to start the service when it’s needed. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 59da373f38..a11baa91de 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -26,8 +26,26 @@ - iptables now uses - nf_tables backend. + iptables is now using + nf_tables under the hood, by using + iptables-nft, similar to + Debian + and + Fedora. + This means, ip[6]tables, + arptables and ebtables + commands will actually show rules from some specific tables in + the nf_tables kernel subsystem. + + + + + systemd got an nftables backend, and + configures (networkd) rules in their own + io.systemd.* tables. Check + nft list ruleset to see these rules, not + iptables-save (which only shows + iptables-created rules. @@ -1429,6 +1447,17 @@ Superuser created successfully. knob. + + + /usr will always be included in the initial + ramdisk. See the + fileSystems.<name>.neededForBoot + option. If any files exist under /usr + (which is not typical for NixOS), they will be included in the + initial ramdisk, increasing its size to a possibly problematic + extent. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 4242b27093..815da359e6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -50,6 +50,18 @@ granular distinction between reloads and restarts. + + + kops + defaults to 1.22.4, which will enable + Instance + Metadata Service Version 2 and require tokens on new + clusters with Kubernetes 1.22. This will increase security by + default, but may break some types of workloads. See the + release + notes for details. + +
@@ -98,7 +110,7 @@ FRRouting, a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as - services.frr + services.frr @@ -108,6 +120,13 @@ services.heisenbridge. + + + snowflake-proxy, + a system to defeat internet censorship. Available as + services.snowflake-proxy. + + ergochat, a modern @@ -122,6 +141,13 @@ services.powerdns-admin. + + + pgadmin4, + an admin interface for the PostgreSQL database. Available at + services.pgadmin. + + input-remapper, @@ -145,6 +171,15 @@ services.maddy. + + + K40-Whisperer, + a program to control cheap Chinese laser cutters. Available as + programs.k40-whisperer.enable. + Users must add themselves to the k40 group + to be able to access the device. + + mtr-exporter, @@ -196,7 +231,7 @@ moosefs, fault tolerant petabyte distributed file system. Available as - moosefs. + moosefs. @@ -353,6 +388,116 @@ its reliance on python2. + + + The matrix-synapse service + (services.matrix-synapse) has been + converted to use the settings option + defined in RFC42. This means that options that are part of + your homeserver.yaml configuration, and + that were specified at the top-level of the module + (services.matrix-synapse) now need to be + moved into + services.matrix-synapse.settings. And while + not all options you may use are defined in there, they are + still supported, because you can set arbitrary values in this + freeform type. + + + An example to make the required migration clearer: + + + Before: + + +{ + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; +} + + + After: + + +{ + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; +} + + + The secrets in your original config should be migrated into a + YAML file that is included via + extraConfigFiles. + + + Additionally a few option defaults have been synced up with + upstream default values, for example the + max_upload_size grew from + 10M to 50M. + + The MoinMoin wiki engine @@ -444,6 +589,13 @@ support due to python2 deprecation in nixpkgs + + + services.miniflux.adminCredentialFiles is + now required, instead of defaulting to + admin and password. + + The autorestic package has been upgraded @@ -530,6 +682,21 @@ tilp2 was removed together with its module + + + The F-PROT antivirus (fprot package) and + its service module were removed because it reached + end-of-life. + + + + + bird1 and its modules + services.bird as well as + services.bird6 have been removed. Upgrade + to services.bird2. + + The options @@ -558,6 +725,15 @@ ~/.local/share/polymc/polymc.cfg. + + + systemd-nspawn@.service settings have been + reverted to the default systemd behaviour. User namespaces are + now activated by default. If you want to keep running nspawn + containers without user namespaces you need to set + systemd.nspawn.<name>.execConfig.PrivateUsers = false + + The terraform 0.12 compatibility has been removed and the @@ -590,6 +766,13 @@ otelcorecol and enjoy a 7x smaller binary. + + + pkgs.pgadmin now refers to + pkgs.pgadmin4. If you still need pgadmin3, + use pkgs.pgadmin3. + + pkgs.noto-fonts-cjk is now deprecated in @@ -700,6 +883,83 @@ olimorris/onedarkpro.nvim). + + + services.pipewire.enable will default to + enabling the WirePlumber session manager instead of + pipewire-media-session. pipewire-media-session is deprecated + by upstream and not recommended, but can still be manually + enabled by setting + services.pipewire.media-session.enable to + true and + services.pipewire.wireplumber.enable to + false. + + + + + pkgs.makeDesktopItem has been refactored to + provide a more idiomatic API. Specifically: + + + + + All valid options as of FDO Desktop Entry specification + version 1.4 can now be passed in as explicit arguments + + + + + exec can now be null, for entries that + are not of type Application + + + + + mimeType argument is renamed to + mimeTypes for consistency + + + + + mimeTypes, + categories, + implements, + keywords, onlyShowIn + and notShowIn take lists of strings + instead of one string with semicolon separators + + + + + extraDesktopEntries renamed to + extraConfig for consistency + + + + + Actions should now be provided as an attrset + actions, the Actions + line will be autogenerated. + + + + + extraEntries is removed. + + + + + Additional validation is added both at eval time and at + build time. + + + + + See the vscode package for a more detailed + example. + +
@@ -901,6 +1161,16 @@ true. + + + The element-desktop package now has an + useKeytar option (defaults to + true), which allows disabling + keytar and in turn + libsecret usage (which binds to native + credential managers / keychain libraries). + + The option services.thelounge.plugins has @@ -916,6 +1186,14 @@ renamed to linux-firmware. + + + It is now possible to specify wordlists to include as handy to + access environment variables using the + config.environment.wordlist configuration + options. + + The services.mbpfan module was converted to @@ -954,6 +1232,13 @@ Plugins are automatically repackaged using autoPatchelf. + + + services.logrotate.enable now defaults to + true if any rotate path has been defined, and some paths have + been added by default. + + The zrepl package has been updated from @@ -990,10 +1275,20 @@ warning. + + + The pomerium-cli command has been moved out + of the pomerium package into the + pomerium-cli package, following upstream’s + repository split. If you are using the + pomerium-cli command, you should now + install the pomerium-cli package. + + The option - services.networking.networkmanager.enableFccUnlock + services.networking.networkmanager.enableFccUnlock was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. See @@ -1010,6 +1305,14 @@ tmux. + + + The polkit service, available at + security.polkit.enable, is now disabled by + default. It will automatically be enabled through services and + desktop environments as needed. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml index 74ca57850e..216fea6777 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 1b59842e02..f3644c3283 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -8,7 +8,15 @@ In addition to numerous new and upgraded packages, this release has the followin - Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package. -- `iptables` now uses `nf_tables` backend. +- `iptables` is now using `nf_tables` under the hood, by using `iptables-nft`, + similar to [Debian](https://wiki.debian.org/nftables#Current_status) and + [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default). + This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually + show rules from some specific tables in the `nf_tables` kernel subsystem. + +- systemd got an `nftables` backend, and configures (networkd) rules in their + own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not + `iptables-save` (which only shows `iptables`-created rules. - PHP now defaults to PHP 8.0, updated from 7.4. @@ -419,6 +427,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be reenabled via the `kernel.unprivileged_bpf_disabled` sysctl knob. +- `/usr` will always be included in the initial ramdisk. See the `fileSystems..neededForBoot` option. + If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index b8e83591cc..1e7d8413f9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -19,6 +19,8 @@ In addition to numerous new and upgraded packages, this release has the followin - systemd services can now set [systemd.services.\.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts. +- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. + ## New Services {#sec-release-22.05-new-services} - [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable). @@ -31,20 +33,26 @@ In addition to numerous new and upgraded packages, this release has the followin - [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). -- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable) +- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.frr.babel.enable) - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). +- [snowflake-proxy](https://snowflake.torproject.org/), a system to defeat internet censorship. Available as [services.snowflake-proxy](options.html#opt-services.snowflake-proxy.enable). + - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable). - [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable). +- [pgadmin4](https://github.com/postgres/pgadmin4), an admin interface for the PostgreSQL database. Available at [services.pgadmin](options.html#opt-services.pgadmin.enable). + - [input-remapper](https://github.com/sezanzeb/input-remapper), an easy to use tool to change the mapping of your input device buttons. Available at [services.input-remapper](options.html#opt-services.input-remapper.enable). - [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](options.html#opt-services.invoiceplane.enable). - [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable). +- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device. + - [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable). - [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable). @@ -58,7 +66,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable). - [moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. - Available as [moosefs](#opt-services.moosefs). + Available as [moosefs](#opt-services.moosefs.client.enable). - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). @@ -120,6 +128,95 @@ In addition to numerous new and upgraded packages, this release has the followin - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. +- The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. + This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the + module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you + may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type. + + An example to make the required migration clearer: + + Before: + ```nix + { + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; + } + ``` + + After: + ```nix + { + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; + } + ``` + + The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. + + Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. + - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. @@ -147,6 +244,8 @@ In addition to numerous new and upgraded packages, this release has the followin - opensmtpd-extras is no longer build with python2 scripting support due to python2 deprecation in nixpkgs +- `services.miniflux.adminCredentialFiles` is now required, instead of defaulting to `admin` and `password`. + - The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details. - For `pkgs.python3.pkgs.ipython`, its direct dependency `pkgs.python3.pkgs.matplotlib-inline` @@ -174,10 +273,16 @@ In addition to numerous new and upgraded packages, this release has the followin - `tilp2` was removed together with its module +- The F-PROT antivirus (`fprot` package) and its service module were removed because it + reached [end-of-life](https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam). + +- `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`. + - The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. +- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn..execConfig.PrivateUsers = false` - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does). @@ -191,6 +296,8 @@ In addition to numerous new and upgraded packages, this release has the followin you should change the package you refer to. If you don't need them update your commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. +- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. + If you still need pgadmin3, use `pkgs.pgadmin3`. - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release @@ -220,6 +327,22 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). +- `services.pipewire.enable` will default to enabling the WirePlumber session manager instead of pipewire-media-session. + pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting + `services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`. + +- `pkgs.makeDesktopItem` has been refactored to provide a more idiomatic API. Specifically: + - All valid options as of FDO Desktop Entry specification version 1.4 can now be passed in as explicit arguments + - `exec` can now be null, for entries that are not of type Application + - `mimeType` argument is renamed to `mimeTypes` for consistency + - `mimeTypes`, `categories`, `implements`, `keywords`, `onlyShowIn` and `notShowIn` take lists of strings instead of one string with semicolon separators + - `extraDesktopEntries` renamed to `extraConfig` for consistency + - Actions should now be provided as an attrset `actions`, the `Actions` line will be autogenerated. + - `extraEntries` is removed. + - Additional validation is added both at eval time and at build time. + + See the `vscode` package for a more detailed example. + ## Other Notable Changes {#sec-release-22.05-notable-changes} @@ -304,10 +427,16 @@ In addition to numerous new and upgraded packages, this release has the followin using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. +- The `element-desktop` package now has an `useKeytar` option (defaults to `true`), + which allows disabling `keytar` and in turn `libsecret` usage + (which binds to native credential managers / keychain libraries). + - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. +- It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options. + - The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. - The default value for `programs.spacefm.settings.graphical_su` got unset. It previously pointed to `gksu` which has been removed. @@ -320,6 +449,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins. Plugins are automatically repackaged using autoPatchelf. +- `services.logrotate.enable` now defaults to true if any rotate path has + been defined, and some paths have been added by default. + - The `zrepl` package has been updated from 0.4.0 to 0.5: - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. @@ -329,12 +461,19 @@ In addition to numerous new and upgraded packages, this release has the followin Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- The `pomerium-cli` command has been moved out of the `pomerium` package into + the `pomerium-cli` package, following upstream's repository split. If you are + using the `pomerium-cli` command, you should now install the `pomerium-cli` + package. + - The option - [services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock) + [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock) was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. See [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. - `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`. +- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. + diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index 190c4db4d4..733f9ca522 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -150,7 +150,8 @@ rec { rm '${output}' fi - inherit_errexit_restore=$(shopt -p inherit_errexit) + inherit_errexit_enabled=0 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 shopt -s inherit_errexit '' + concatStringsSep @@ -170,7 +171,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF - $inherit_errexit_restore + (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit ''; systemdUtils = { diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 99bdb11b01..5b60b17312 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -83,6 +83,7 @@ in { b43Firmware_5_1_138 b43Firmware_6_30_163_46 b43FirmwareCutter + xow_dongle-firmware ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware; }) (mkIf cfg.wirelessRegulatoryDatabase { diff --git a/third_party/nixpkgs/nixos/modules/hardware/xone.nix b/third_party/nixpkgs/nixos/modules/hardware/xone.nix new file mode 100644 index 0000000000..89690d8c6f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/xone.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.xone; +in +{ + options.hardware.xone = { + enable = mkEnableOption "the xone driver for Xbox One and Xbobx Series X|S accessories"; + }; + + config = mkIf cfg.enable { + boot = { + blacklistedKernelModules = [ "xpad" "mt76x2u" ]; + extraModulePackages = with config.boot.kernelPackages; [ xone ]; + }; + hardware.firmware = [ pkgs.xow_dongle-firmware ]; + }; + + meta = { + maintainers = with maintainers; [ rhysmdnz ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 165e2aac27..321793882f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/third_party/nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -24,6 +24,9 @@ [pi3] kernel=u-boot-rpi3.bin + [pi02] + kernel=u-boot-rpi3.bin + [pi4] kernel=u-boot-rpi4.bin enable_gic=1 @@ -33,6 +36,9 @@ # what the pi3 firmware does by default. disable_overscan=1 + # Supported in newer board revisions + arm_boost=1 + [all] # Boot in 64-bit mode. arm_64bit=1 diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index b7746ddc21..9304c307af 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -129,7 +129,7 @@ let genericName = "View NixOS documentation in a web browser"; icon = "nix-snowflake"; exec = "nixos-help"; - categories = "System"; + categories = ["System"]; }; in pkgs.symlinkJoin { diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 9d62008430..7d1faa50f4 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -82,14 +82,14 @@ in git = 41; #fourstore = 42; # dropped in 20.03 #fourstorehttp = 43; # dropped in 20.03 - virtuoso = 44; + #virtuoso = 44; dropped module #rtkit = 45; # dynamically allocated 2021-09-03 dovecot2 = 46; dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused # bind = 53; #dynamically allocated as of 2021-09-03 wwwrun = 54; #adm = 55; # unused @@ -412,7 +412,7 @@ in prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused #bind = 53; # unused wwwrun = 54; adm = 55; diff --git a/third_party/nixpkgs/nixos/modules/misc/version.nix b/third_party/nixpkgs/nixos/modules/misc/version.nix index 6c526f6d4f..6c072021ed 100644 --- a/third_party/nixpkgs/nixos/modules/misc/version.nix +++ b/third_party/nixpkgs/nixos/modules/misc/version.nix @@ -1,12 +1,17 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.system.nixos; opt = options.system.nixos; -in + inherit (lib) + concatStringsSep mapAttrsToList toLower + literalExpression mkRenamedOptionModule mkDefault mkOption trivial types; + + attrsToText = attrs: + concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs); + +in { imports = [ (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) @@ -101,22 +106,30 @@ in # Generate /etc/os-release. See # https://www.freedesktop.org/software/systemd/man/os-release.html for the # format. - environment.etc.os-release.text = - '' - NAME=NixOS - ID=nixos - VERSION="${cfg.release} (${cfg.codeName})" - VERSION_CODENAME=${toLower cfg.codeName} - VERSION_ID="${cfg.release}" - BUILD_ID="${cfg.version}" - PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})" - LOGO="nix-snowflake" - HOME_URL="https://nixos.org/" - DOCUMENTATION_URL="https://nixos.org/learn.html" - SUPPORT_URL="https://nixos.org/community.html" - BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" - ''; + environment.etc = { + "lsb-release".text = attrsToText { + LSB_VERSION = "${cfg.release} (${cfg.codeName})"; + DISTRIB_ID = "nixos"; + DISTRIB_RELEASE = cfg.release; + DISTRIB_CODENAME = toLower cfg.codeName; + DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})"; + }; + "os-release".text = attrsToText { + NAME = "NixOS"; + ID = "nixos"; + VERSION = "${cfg.release} (${cfg.codeName})"; + VERSION_CODENAME = toLower cfg.codeName; + VERSION_ID = cfg.release; + BUILD_ID = cfg.version; + PRETTY_NAME = "NixOS ${cfg.release} (${cfg.codeName})"; + LOGO = "nix-snowflake"; + HOME_URL = "https://nixos.org/"; + DOCUMENTATION_URL = "https://nixos.org/learn.html"; + SUPPORT_URL = "https://nixos.org/community.html"; + BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues"; + }; + }; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/third_party/nixpkgs/nixos/modules/misc/wordlist.nix b/third_party/nixpkgs/nixos/modules/misc/wordlist.nix new file mode 100644 index 0000000000..988b522d74 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/misc/wordlist.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: +with lib; +let + concatAndSort = name: files: pkgs.runCommand name {} '' + awk 1 ${lib.escapeShellArgs files} | sed '{ /^\s*$/d; s/^\s\+//; s/\s\+$// }' | sort | uniq > $out + ''; +in +{ + options = { + environment.wordlist = { + enable = mkEnableOption "environment variables for lists of words"; + + lists = mkOption { + type = types.attrsOf (types.nonEmptyListOf types.path); + + default = { + WORDLIST = [ "${pkgs.scowl}/share/dict/words.txt" ]; + }; + + defaultText = literalExpression '' + { + WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; + } + ''; + + description = '' + A set with the key names being the environment variable you'd like to + set and the values being a list of paths to text documents containing + lists of words. The various files will be merged, sorted, duplicates + removed, and extraneous spacing removed. + + If you have a handful of words that you want to add to an already + existing wordlist, you may find `builtins.toFile` useful for this + task. + ''; + + example = literalExpression '' + { + WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; + AUGMENTED_WORDLIST = [ + "''${pkgs.scowl}/share/dict/words.txt" + "''${pkgs.scowl}/share/dict/words.variants.txt" + (builtins.toFile "extra-words" ''' + desynchonization + oobleck''') + ]; + } + ''; + }; + }; + }; + + config = mkIf config.environment.wordlist.enable { + environment.variables = + lib.mapAttrs + (name: value: "${concatAndSort "wordlist-${name}" value}") + config.environment.wordlist.lists; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index ca82ddfb58..f3570c3f12 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -91,6 +91,7 @@ ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix + ./hardware/xone.nix ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix @@ -115,6 +116,7 @@ ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix + ./misc/wordlist.nix ./misc/nixops-autoluks.nix ./programs/adb.nix ./programs/appgate-sdp.nix @@ -166,6 +168,7 @@ ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix + ./programs/k40-whisperer.nix ./programs/kdeconnect.nix ./programs/kbdlight.nix ./programs/less.nix @@ -252,6 +255,7 @@ ./security/tpm2.nix ./services/admin/meshcentral.nix ./services/admin/oxidized.nix + ./services/admin/pgadmin.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix @@ -349,7 +353,6 @@ ./services/databases/redis.nix ./services/databases/riak.nix ./services/databases/victoriametrics.nix - ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix @@ -394,6 +397,7 @@ ./services/development/jupyterhub/default.nix ./services/development/rstudio-server/default.nix ./services/development/lorri.nix + ./services/development/zammad.nix ./services/display-managers/greetd.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix @@ -451,6 +455,7 @@ ./services/hardware/vdr.nix ./services/hardware/xow.nix ./services/home-automation/home-assistant.nix + ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix @@ -495,6 +500,7 @@ ./services/mail/roundcube.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix + ./services/matrix/matrix-synapse.nix ./services/matrix/mjolnir.nix ./services/matrix/pantalaimon.nix ./services/misc/ananicy.nix @@ -561,7 +567,6 @@ ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-appservice-irc.nix ./services/misc/matrix-conduit.nix - ./services/misc/matrix-synapse.nix ./services/misc/mautrix-facebook.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix @@ -622,7 +627,6 @@ ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/xmrig.nix - ./services/misc/zigbee2mqtt.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix ./services/monitoring/alerta.nix @@ -873,6 +877,7 @@ ./services/networking/shorewall6.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix + ./services/networking/snowflake-proxy.nix ./services/networking/smartdns.nix ./services/networking/smokeping.nix ./services/networking/softether.nix @@ -897,6 +902,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix + ./services/networking/tetrd.nix ./services/networking/teleport.nix ./services/networking/thelounge.nix ./services/networking/tinc.nix @@ -946,7 +952,6 @@ ./services/security/clamav.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix - ./services/security/fprot.nix ./services/security/haka.nix ./services/security/haveged.nix ./services/security/hockeypuck.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/firejail.nix b/third_party/nixpkgs/nixos/modules/programs/firejail.nix index 8c10d7c4df..76b42168c1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firejail.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firejail.nix @@ -17,8 +17,8 @@ let then value else { executable = value; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( - (optional (opts.profile != null) "--profile=${toString opts.profile}") - ++ opts.extraArgs + opts.extraArgs + ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") ); in '' diff --git a/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix new file mode 100644 index 0000000000..3163e45f57 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.k40-whisperer; + pkg = cfg.package.override { + udevGroup = cfg.group; + }; +in +{ + options.programs.k40-whisperer = { + enable = mkEnableOption "K40-Whisperer"; + + group = mkOption { + type = types.str; + description = '' + Group assigned to the device when connected. + ''; + default = "k40"; + }; + + package = mkOption { + type = types.package; + default = pkgs.k40-whisperer; + defaultText = literalExpression "pkgs.k40-whisperer"; + example = literalExpression "pkgs.k40-whisperer"; + description = '' + K40 Whisperer package to use. + ''; + }; + }; + + config = mkIf cfg.enable { + users.groups.${cfg.group} = {}; + + environment.systemPackages = [ pkg ]; + services.udev.packages = [ pkg ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/phosh.nix b/third_party/nixpkgs/nixos/modules/programs/phosh.nix index cba3f73768..ad875616ac 100644 --- a/third_party/nixpkgs/nixos/modules/programs/phosh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/phosh.nix @@ -8,18 +8,17 @@ let # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop oskItem = pkgs.makeDesktopItem { name = "sm.puri.OSK0"; - type = "Application"; desktopName = "On-screen keyboard"; exec = "${pkgs.squeekboard}/bin/squeekboard"; - categories = "GNOME;Core;"; - extraEntries = '' - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Panel - X-GNOME-Provides=inputmethod - X-GNOME-Autostart-Notify=true - X-GNOME-AutoRestart=true - ''; + categories = [ "GNOME" "Core" ]; + onlyShowIn = [ "GNOME" ]; + noDisplay = true; + extraConfig = { + X-GNOME-Autostart-Phase = "Panel"; + X-GNOME-Provides = "inputmethod"; + X-GNOME-Autostart-Notify = "true"; + X-GNOME-AutoRestart = "true"; + }; }; phocConfigType = types.submodule { diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index bb9904d195..01b0472813 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -134,6 +134,7 @@ in { ''; }; }; + security.polkit.enable = true; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index c271d504b7..195cf87e6a 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -50,6 +50,7 @@ with lib; (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") @@ -87,10 +88,9 @@ with lib; (mkRemovedOptionModule [ "services" "racoon" ] '' The racoon module has been removed, because the software project was abandoned upstream. '') - (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 9f295db84f..c0ef8b5f30 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -518,7 +518,7 @@ let auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} '' + optionalString cfg.googleAuthenticator.enable '' - auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp + auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp '' + optionalString cfg.duoSecurity.enable '' auth required ${pkgs.duo-unix}/lib/security/pam_duo.so diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index d9c58152f1..1ba149745c 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -12,11 +12,7 @@ in options = { - security.polkit.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable PolKit."; - }; + security.polkit.enable = mkEnableOption "polkit"; security.polkit.extraConfig = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix index 0e3ec5af32..f3a2de3bf8 100644 --- a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix @@ -175,8 +175,8 @@ in { serviceName = "${name}.service"; excludedPath = rootPaths; } '' - mkdir -p "$out/lib/systemd/system" - serviceFile="$out/lib/systemd/system/$serviceName" + mkdir -p "$out/lib/systemd/system/$serviceName.d" + serviceFile="$out/lib/systemd/system/$serviceName.d/confinement.conf" echo '[Service]' > "$serviceFile" diff --git a/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix new file mode 100644 index 0000000000..80b6814541 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix @@ -0,0 +1,127 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + pkg = pkgs.pgadmin4; + cfg = config.services.pgadmin; + + _base = with types; [ int bool str ]; + base = with types; oneOf ([ (listOf (oneOf _base)) (attrsOf (oneOf _base)) ] ++ _base); + + formatAttrset = attr: + "{${concatStringsSep "\n" (mapAttrsToList (key: value: "${builtins.toJSON key}: ${formatPyValue value},") attr)}}"; + + formatPyValue = value: + if builtins.isString value then builtins.toJSON value + else if value ? _expr then value._expr + else if builtins.isInt value then toString value + else if builtins.isBool value then (if value then "True" else "False") + else if builtins.isAttrs value then (formatAttrset value) + else if builtins.isList value then "[${concatStringsSep "\n" (map (v: "${formatPyValue v},") value)}]" + else throw "Unrecognized type"; + + formatPy = attrs: + concatStringsSep "\n" (mapAttrsToList (key: value: "${key} = ${formatPyValue value}") attrs); + + pyType = with types; attrsOf (oneOf [ (attrsOf base) (listOf base) base ]); +in +{ + options.services.pgadmin = { + enable = mkEnableOption "PostgreSQL Admin 4"; + + port = mkOption { + description = "Port for pgadmin4 to run on"; + type = types.port; + default = 5050; + }; + + initialEmail = mkOption { + description = "Initial email for the pgAdmin account."; + type = types.str; + }; + + initialPasswordFile = mkOption { + description = '' + Initial password file for the pgAdmin account. + NOTE: Should be string not a store path, to prevent the password from being world readable. + ''; + type = types.path; + }; + + openFirewall = mkEnableOption "firewall passthrough for pgadmin4"; + + settings = mkOption { + description = '' + Settings for pgadmin4. + Documentation. + ''; + type = pyType; + default= {}; + }; + }; + + config = mkIf (cfg.enable) { + networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.port ]; + + services.pgadmin.settings = { + DEFAULT_SERVER_PORT = cfg.port; + SERVER_MODE = true; + } // (optionalAttrs cfg.openFirewall { + DEFAULT_SERVER = mkDefault "::"; + }); + + systemd.services.pgadmin = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = [ "network.target" ]; + # we're adding this optionally so just in case there's any race it'll be caught + # in case postgres doesn't start, pgadmin will just start normally + wants = [ "postgresql.service" ]; + + path = [ config.services.postgresql.package pkgs.coreutils pkgs.bash ]; + + preStart = '' + # NOTE: this is idempotent (aka running it twice has no effect) + ( + # Email address: + echo ${escapeShellArg cfg.initialEmail} + + # file might not contain newline. echo hack fixes that. + PW=$(cat ${escapeShellArg cfg.initialPasswordFile}) + + # Password: + echo "$PW" + # Retype password: + echo "$PW" + ) | ${pkg}/bin/pgadmin4-setup + ''; + + restartTriggers = [ + "/etc/pgadmin/config_system.py" + ]; + + serviceConfig = { + User = "pgadmin"; + DynamicUser = true; + LogsDirectory = "pgadmin"; + StateDirectory = "pgadmin"; + ExecStart = "${pkg}/bin/pgadmin4"; + }; + }; + + users.users.pgadmin = { + isSystemUser = true; + group = "pgadmin"; + }; + + users.groups.pgadmin = {}; + + environment.etc."pgadmin/config_system.py" = { + text = formatPy cfg.settings; + mode = "0600"; + user = "pgadmin"; + group = "pgadmin"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index b82aca3976..6d5ce98df8 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -44,24 +44,24 @@ let optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams # global options - ++ [ "--stream.bind_to_address ${cfg.listenAddress}" ] - ++ [ "--stream.port ${toString cfg.port}" ] - ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" - ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" + ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] + ++ [ "--stream.port=${toString cfg.port}" ] + ++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}" + ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc - ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] + ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] ++ optionals cfg.tcp.enable [ - "--tcp.bind_to_address ${cfg.tcp.listenAddress}" - "--tcp.port ${toString cfg.tcp.port}" ] + "--tcp.bind_to_address=${cfg.tcp.listenAddress}" + "--tcp.port=${toString cfg.tcp.port}" ] # http json rpc - ++ [ "--http.enabled ${toString cfg.http.enable}" ] + ++ [ "--http.enabled=${toString cfg.http.enable}" ] ++ optionals cfg.http.enable [ - "--http.bind_to_address ${cfg.http.listenAddress}" - "--http.port ${toString cfg.http.port}" - ] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\""); + "--http.bind_to_address=${cfg.http.listenAddress}" + "--http.port=${toString cfg.http.port}" + ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); in { imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix index 88bde4e915..7d9198d20e 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix @@ -266,7 +266,7 @@ in in '' export KUBECONFIG=${clusterAdminKubeconfig} - ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} ''; })]); diff --git a/third_party/nixpkgs/nixos/modules/services/databases/virtuoso.nix b/third_party/nixpkgs/nixos/modules/services/databases/virtuoso.nix deleted file mode 100644 index 8b01622ecb..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/databases/virtuoso.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.virtuoso; - virtuosoUser = "virtuoso"; - stateDir = "/var/lib/virtuoso"; -in -with lib; -{ - - ###### interface - - options = { - - services.virtuoso = { - - enable = mkEnableOption "Virtuoso Opensource database server"; - - config = mkOption { - type = types.lines; - default = ""; - description = "Extra options to put into Virtuoso configuration file."; - }; - - parameters = mkOption { - type = types.lines; - default = ""; - description = "Extra options to put into [Parameters] section of Virtuoso configuration file."; - }; - - listenAddress = mkOption { - type = types.str; - default = "1111"; - example = "myserver:1323"; - description = "ip:port or port to listen on."; - }; - - httpListenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "myserver:8080"; - description = "ip:port or port for Virtuoso HTTP server to listen on."; - }; - - dirsAllowed = mkOption { - type = types.nullOr types.str; # XXX Maybe use a list in the future? - default = null; - example = "/www, /home/"; - description = "A list of directories Virtuoso is allowed to access"; - }; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - users.users.${virtuosoUser} = - { uid = config.ids.uids.virtuoso; - description = "virtuoso user"; - home = stateDir; - }; - - systemd.services.virtuoso = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p ${stateDir} - chown ${virtuosoUser} ${stateDir} - ''; - - script = '' - cd ${stateDir} - ${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config} - ''; - }; - - services.virtuoso.config = '' - [Database] - DatabaseFile=${stateDir}/x-virtuoso.db - TransactionFile=${stateDir}/x-virtuoso.trx - ErrorLogFile=${stateDir}/x-virtuoso.log - xa_persistent_file=${stateDir}/x-virtuoso.pxa - - [Parameters] - ServerPort=${cfg.listenAddress} - RunAs=${virtuosoUser} - ${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"} - ${cfg.parameters} - - [HTTPServer] - ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"} - ''; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix index 7da92cc9f2..5fecc64b4f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix @@ -30,6 +30,8 @@ in { environment.systemPackages = [ pkgs.flatpak ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.flatpak ]; systemd.packages = [ pkgs.flatpak ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 284d8c394a..9aa51b6143 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -8,7 +8,7 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", + "name": "libpipewire-module-rt", "args": {}, "flags": [ "ifexists", diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json new file mode 100644 index 0000000000..c7f58fd579 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json @@ -0,0 +1,118 @@ +{ + "context.properties": { + "link.max-buffers": 16, + "core.daemon": true, + "core.name": "pipewire-0", + "settings.check-quantum": true, + "settings.check-rate": true, + "vm.overrides": { + "default.clock.min-quantum": 1024 + } + }, + "context.spa-libs": { + "audio.convert.*": "audioconvert/libspa-audioconvert", + "api.alsa.*": "alsa/libspa-alsa", + "support.*": "support/libspa-support" + }, + "context.modules": [ + { + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, + "flags": [ + "ifexists", + "nofail" + ] + }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-profiler" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-spa-node-factory" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-access", + "args": {} + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-link-factory" + } + ], + "context.objects": [ + { + "factory": "metadata", + "args": { + "metadata.name": "default" + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Dummy-Driver", + "node.group": "pipewire.dummy", + "priority.driver": 20000 + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Freewheel-Driver", + "priority.driver": 19000, + "node.group": "pipewire.freewheel", + "node.freewheel": true + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.source", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Source", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.sink", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Sink", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + } + ], + "context.exec": [] +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index 3ed994f111..df0f62556d 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -6,8 +6,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" @@ -37,6 +39,61 @@ } } ], - "context.exec": [], - "stream.properties": {} + "context.exec": [ + { + "path": "pactl", + "args": "load-module module-always-sink" + } + ], + "stream.properties": {}, + "pulse.rules": [ + { + "matches": [ + {} + ], + "actions": { + "update-props": {} + } + }, + { + "matches": [ + { + "application.process.binary": "teams" + }, + { + "application.process.binary": "skypeforlinux" + } + ], + "actions": { + "quirks": [ + "force-s16-info" + ] + } + }, + { + "matches": [ + { + "application.process.binary": "firefox" + } + ], + "actions": { + "quirks": [ + "remove-capture-dont-move" + ] + } + }, + { + "matches": [ + { + "application.name": "~speech-dispatcher*" + } + ], + "actions": { + "update-props": { + "pulse.min.req": "1024/48000", + "pulse.min.quantum": "1024/48000" + } + } + } + ] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index a923ab4db2..7c79f0168c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json @@ -3,6 +3,7 @@ "link.max-buffers": 16, "core.daemon": true, "core.name": "pipewire-0", + "default.clock.min-quantum": 16, "vm.overrides": { "default.clock.min-quantum": 1024 } @@ -19,8 +20,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index f7a03a4a3e..109c91134b 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -38,9 +38,8 @@ in { services.pipewire.media-session = { enable = mkOption { type = types.bool; - default = config.services.pipewire.enable; - defaultText = literalExpression "config.services.pipewire.enable"; - description = "Example pipewire session manager"; + default = false; + description = "Whether to enable the deprecated example Pipewire session manager"; }; package = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index c3cfd46e61..59e9342a6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -25,15 +25,18 @@ let client = lib.importJSON ./daemon/client.conf.json; client-rt = lib.importJSON ./daemon/client-rt.conf.json; jack = lib.importJSON ./daemon/jack.conf.json; + minimal = lib.importJSON ./daemon/minimal.conf.json; pipewire = lib.importJSON ./daemon/pipewire.conf.json; pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; + useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable; + configs = { client = recursiveUpdate defaults.client cfg.config.client; client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; jack = recursiveUpdate defaults.jack cfg.config.jack; - pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; + pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; }; in { diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix index ad96dc1f97..52ec17b95d 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -8,15 +8,18 @@ in options = { services.pipewire.wireplumber = { - enable = lib.mkEnableOption "A modular session / policy manager for PipeWire"; + enable = lib.mkOption { + type = lib.types.bool; + default = config.services.pipewire.enable; + defaultText = lib.literalExpression "config.services.pipewire.enable"; + description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; + }; package = lib.mkOption { type = lib.types.package; default = pkgs.wireplumber; defaultText = lib.literalExpression "pkgs.wireplumber"; - description = '' - The wireplumber derivation to use. - ''; + description = "The wireplumber derivation to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/zammad.nix b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix new file mode 100644 index 0000000000..d457a60718 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix @@ -0,0 +1,323 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.zammad; + settingsFormat = pkgs.formats.yaml { }; + filterNull = filterAttrs (_: v: v != null); + serviceConfig = { + Type = "simple"; + Restart = "always"; + + User = "zammad"; + Group = "zammad"; + PrivateTmp = true; + StateDirectory = "zammad"; + WorkingDirectory = cfg.dataDir; + }; + environment = { + RAILS_ENV = "production"; + NODE_ENV = "production"; + RAILS_SERVE_STATIC_FILES = "true"; + RAILS_LOG_TO_STDOUT = "true"; + }; + databaseConfig = settingsFormat.generate "database.yml" cfg.database.settings; +in +{ + + options = { + services.zammad = { + enable = mkEnableOption "Zammad, a web-based, open source user support/ticketing solution."; + + package = mkOption { + type = types.package; + default = pkgs.zammad; + defaultText = literalExpression "pkgs.zammad"; + description = "Zammad package to use."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/zammad"; + description = '' + Path to a folder that will contain Zammad working directory. + ''; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "192.168.23.42"; + description = "Host address."; + }; + + openPorts = mkOption { + type = types.bool; + default = false; + description = "Whether to open firewall ports for Zammad"; + }; + + port = mkOption { + type = types.port; + default = 3000; + description = "Web service port."; + }; + + websocketPort = mkOption { + type = types.port; + default = 6042; + description = "Websocket service port."; + }; + + database = { + type = mkOption { + type = types.enum [ "PostgreSQL" "MySQL" ]; + default = "PostgreSQL"; + example = "MySQL"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.nullOr types.str; + default = { + PostgreSQL = "/run/postgresql"; + MySQL = "localhost"; + }.${cfg.database.type}; + defaultText = literalExpression '' + { + PostgreSQL = "/run/postgresql"; + MySQL = "localhost"; + }.''${config.services.zammad.database.type}; + ''; + description = '' + Database host address. + ''; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Database port. Use null for default port."; + }; + + name = mkOption { + type = types.str; + default = "zammad"; + description = '' + Database name. + ''; + }; + + user = mkOption { + type = types.nullOr types.str; + default = "zammad"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/zammad-dbpassword"; + description = '' + A file containing the password for . + ''; + }; + + createLocally = mkOption { + type = types.bool; + default = true; + description = "Whether to create a local database automatically."; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + example = literalExpression '' + { + } + ''; + description = '' + The database.yml configuration file as key value set. + See + for list of configuration parameters. + ''; + }; + }; + + secretKeyBaseFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/secret_key_base"; + description = '' + The path to a file containing the + secret_key_base secret. + + Zammad uses secret_key_base to encrypt + the cookie store, which contains session data, and to digest + user auth tokens. + + Needs to be a 64 byte long string of hexadecimal + characters. You can generate one by running + + + $ openssl rand -hex 64 >/path/to/secret_key_base_file + + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + services.zammad.database.settings = { + production = mapAttrs (_: v: mkDefault v) (filterNull { + adapter = { + PostgreSQL = "postgresql"; + MySQL = "mysql2"; + }.${cfg.database.type}; + database = cfg.database.name; + pool = 50; + timeout = 5000; + encoding = "utf8"; + username = cfg.database.user; + host = cfg.database.host; + port = cfg.database.port; + }); + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openPorts [ + config.services.zammad.port + config.services.zammad.websocketPort + ]; + + users.users.zammad = { + isSystemUser = true; + home = cfg.dataDir; + group = "zammad"; + }; + + users.groups.zammad = { }; + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.user == "zammad"; + message = "services.zammad.database.user must be set to \"zammad\" if services.zammad.database.createLocally is set to true"; + } + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "a password cannot be specified if services.zammad.database.createLocally is set to true"; + } + ]; + + services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.postgresql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; + + systemd.services.zammad-web = { + inherit environment; + serviceConfig = serviceConfig // { + # loading all the gems takes time + TimeoutStartSec = 1200; + }; + after = [ + "network.target" + "postgresql.service" + ]; + requires = [ + "postgresql.service" + ]; + description = "Zammad web"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + # Blindly copy the whole project here. + chmod -R +w . + rm -rf ./public/assets/* + rm -rf ./tmp/* + rm -rf ./log/* + cp -r --no-preserve=owner ${cfg.package}/* . + chmod -R +w . + # config file + cp ${databaseConfig} ./config/database.yml + chmod -R +w . + ${optionalString (cfg.database.passwordFile != null) '' + { + echo -n " password: " + cat ${cfg.database.passwordFile} + } >> ./config/database.yml + ''} + ${optionalString (cfg.secretKeyBaseFile != null) '' + { + echo "production: " + echo -n " secret_key_base: " + cat ${cfg.secretKeyBaseFile} + } > ./config/secrets.yml + ''} + + if [ `${config.services.postgresql.package}/bin/psql \ + --host ${cfg.database.host} \ + ${optionalString + (cfg.database.port != null) + "--port ${toString cfg.database.port}"} \ + --username ${cfg.database.user} \ + --dbname ${cfg.database.name} \ + --command "SELECT COUNT(*) FROM pg_class c \ + JOIN pg_namespace s ON s.oid = c.relnamespace \ + WHERE s.nspname NOT IN ('pg_catalog', 'pg_toast', 'information_schema') \ + AND s.nspname NOT LIKE 'pg_temp%';" | sed -n 3p` -eq 0 ]; then + echo "Initialize database" + ./bin/rake --no-system db:migrate + ./bin/rake --no-system db:seed + else + echo "Migrate database" + ./bin/rake --no-system db:migrate + fi + echo "Done" + ''; + script = "./script/rails server -b ${cfg.host} -p ${toString cfg.port}"; + }; + + systemd.services.zammad-websocket = { + inherit serviceConfig environment; + after = [ "zammad-web.service" ]; + requires = [ "zammad-web.service" ]; + description = "Zammad websocket"; + wantedBy = [ "multi-user.target" ]; + script = "./script/websocket-server.rb -b ${cfg.host} -p ${toString cfg.websocketPort} start"; + }; + + systemd.services.zammad-scheduler = { + inherit environment; + serviceConfig = serviceConfig // { Type = "forking"; }; + after = [ "zammad-web.service" ]; + requires = [ "zammad-web.service" ]; + description = "Zammad scheduler"; + wantedBy = [ "multi-user.target" ]; + script = "./script/scheduler.rb start"; + }; + }; + + meta.maintainers = with lib.maintainers; [ garbas taeer ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix index e898f32605..6be23f3975 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix @@ -32,6 +32,8 @@ with lib; environment.systemPackages = [ pkgs.udisks2 ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.udisks2 ]; systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix index f4197650ab..6022227f6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix @@ -135,7 +135,7 @@ in { }; config = mkOption { - type = types.submodule { + type = types.nullOr (types.submodule { freeformType = format.type; options = { # This is a partial selection of the most common options, so new users can quickly @@ -244,7 +244,7 @@ in { }; }; }; - }; + }); example = literalExpression '' { homeassistant = { @@ -349,10 +349,6 @@ in { ''; description = '' The Home Assistant package to use. - Override extraPackages or extraComponents in order to add additional dependencies. - If you specify and do not set - to false, overriding extraComponents will have no effect. - Avoid home-assistant.overridePythonAttrs if you use autoExtraComponents. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix similarity index 100% rename from third_party/nixpkgs/nixos/modules/services/misc/zigbee2mqtt.nix rename to third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 8cef4e8c08..082cf92ff4 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.logrotate; - inherit (config.users) groups; pathOpts = { name, ... }: { options = { @@ -85,10 +84,6 @@ let }; config.name = name; - config.extraConfig = '' - missingok - notifempty - ''; }; mkConf = pathOpts: '' @@ -102,7 +97,11 @@ let ''; paths = sortProperties (attrValues (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths)); - configFile = pkgs.writeText "logrotate.conf" (concatStringsSep "\n" ((map mkConf paths) ++ [ cfg.extraConfig ])); + configFile = pkgs.writeText "logrotate.conf" ( + concatStringsSep "\n" ( + [ "missingok" "notifempty" cfg.extraConfig ] ++ (map mkConf paths) + ) + ); in { @@ -112,7 +111,10 @@ in options = { services.logrotate = { - enable = mkEnableOption "the logrotate systemd service"; + enable = mkEnableOption "the logrotate systemd service" // { + default = foldr (n: a: a || n.enable) false (attrValues cfg.paths); + defaultText = literalExpression "cfg.paths != {}"; + }; paths = mkOption { type = with types; attrsOf (submodule pathOpts); @@ -163,28 +165,8 @@ in } ) cfg.paths; - services.logrotate = { - paths = { - "/var/log/btmp" = { - frequency = mkDefault "monthly"; - keep = mkDefault 1; - extraConfig = '' - create 0660 root ${groups.utmp.name} - ''; - }; - "/var/log/wtmp" = { - frequency = mkDefault "monthly"; - keep = mkDefault 1; - extraConfig = '' - create 0664 root ${groups.utmp.name} - ''; - }; - }; - }; - systemd.services.logrotate = { description = "Logrotate Service"; - wantedBy = [ "multi-user.target" ]; startAt = "hourly"; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse-log_config.yaml similarity index 100% rename from third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse-log_config.yaml rename to third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse-log_config.yaml diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.nix b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.nix new file mode 100644 index 0000000000..c4d14dbd54 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.nix @@ -0,0 +1,773 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.matrix-synapse; + format = pkgs.formats.yaml {}; + + # remove null values from the final configuration + finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; + configFile = format.generate "homeserver.yaml" finalSettings; + logConfigFile = format.generate "log_config.yaml" cfg.logConfig; + + pluginsEnv = cfg.package.python.buildEnv.override { + extraLibs = cfg.plugins; + }; + + usePostgresql = cfg.settings.database.name == "psycopg2"; + hasLocalPostgresDB = let args = cfg.settings.database.args; in + usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); + + registerNewMatrixUser = + let + isIpv6 = x: lib.length (lib.splitString ":" x) > 1; + listener = + lib.findFirst ( + listener: lib.any ( + resource: lib.any ( + name: name == "client" + ) resource.names + ) listener.resources + ) (lib.last cfg.settings.listeners) cfg.settings.listeners; + # FIXME: Handle cases with missing client listener properly, + # don't rely on lib.last, this will not work. + + # add a tail, so that without any bind_addresses we still have a useable address + bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]); + listenerProtocol = if listener.tls + then "https" + else "http"; + in + pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' + exec ${cfg.package}/bin/register_new_matrix_user \ + $@ \ + ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ + "${listenerProtocol}://${ + if (isIpv6 bindAddress) then + "[${bindAddress}]" + else + "${bindAddress}" + }:${builtins.toString listener.port}/" + ''; +in { + + imports = [ + + (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' + The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 + as the behavior is now obsolete. + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' + Database configuration must be done manually. An exemplary setup is demonstrated in + + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' + You may add additional event types via + `services.matrix-synapse.room_prejoin_state.additional_event_types` and + disable the default events via + `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. + '') + + # options that don't exist in synapse anymore + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_host" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_port" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "expire_access_tokens" ] "" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "no_tls" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_dh_param_path" ] "It was removed from synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "unsecure_port" ] "Use settings.listeners instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." ) + + # options that were moved into rfc42 style settigns + (mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_Files instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_type" ] "Use settings.database.name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_user" ] "Use settings.database.args.user instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "dynamic_thumbnails" ] "Use settings.dynamic_thumbnails instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_metrics" ] "Use settings.enable_metrics instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration" ] "Use settings.enable_registration instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "extraConfig" ] "Use settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "listeners" ] "Use settings.listeners instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "logConfig" ] "Use settings.log_config instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_image_pixels" ] "Use settings.max_image_pixels instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_upload_size" ] "Use settings.max_upload_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "presence" "enabled" ] "Use settings.presence.enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "public_baseurl" ] "Use settings.public_baseurl instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "report_stats" ] "Use settings.report_stats instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "server_name" ] "Use settings.server_name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "servers" ] "Use settings.trusted_key_servers instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_certificate_path" ] "Use settings.tls_certificate_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_private_key_path" ] "Use settings.tls_private_key_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_shared_secret" ] "Use settings.turn_shared_secret instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_uris" ] "Use settings.turn_uris instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_user_lifetime" ] "Use settings.turn_user_lifetime instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_enabled" ] "Use settings.url_preview_enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_blacklist" ] "Use settings.url_preview_ip_range_blacklist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_whitelist" ] "Use settings.url_preview_ip_range_whitelist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_url_blacklist" ] "Use settings.url_preview_url_blacklist instead" ) + + # options that are too specific to mention them explicitly in settings + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "email" ] "Use settings.account_threepid_delegates.email instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "msisdn" ] "Use settings.account_threepid_delegates.msisdn instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "allow_guest_access" ] "Use settings.allow_guest_access instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bcrypt_rounds" ] "Use settings.bcrypt_rounds instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration_captcha" ] "Use settings.enable_registration_captcha instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "event_cache_size" ] "Use settings.event_cache_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_concurrent" ] "Use settings.rc_federation.concurrent instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_reject_limit" ] "Use settings.rc_federation.reject_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_delay" ] "Use settings.rc_federation.sleep_delay instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_limit" ] "Use settings.rc_federation.sleep_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_window_size" ] "Use settings.rc_federation.window_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "key_refresh_interval" ] "Use settings.key_refresh_interval instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_burst_count" ] "Use settings.rc_messages.burst_count instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_per_second" ] "Use settings.rc_messages.per_second instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_private_key" ] "Use settings.recaptcha_private_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_public_key" ] "Use settings.recaptcha_public_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "redaction_retention_period" ] "Use settings.redaction_retention_period instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "additional_event_types" ] "Use settings.room_prejoin_state.additional_event_types instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "disable_default_event_types" ] "Use settings.room_prejoin-state.disable_default_event_types instead" ) + + # Options that should be passed via extraConfigFiles, so they are not persisted into the nix store + (mkRemovedOptionModule [ "services" "matrix-synapse" "macaroon_secret_key" ] "Pass this value via extraConfigFiles instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "registration_shared_secret" ] "Pass this value via extraConfigFiles instead" ) + + ]; + + options = { + services.matrix-synapse = { + enable = mkEnableOption "matrix.org synapse"; + + configFile = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the configuration file on the target system. Useful to configure e.g. workers + that also need this. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.matrix-synapse; + defaultText = literalExpression "pkgs.matrix-synapse"; + description = '' + Overridable attribute of the matrix synapse server package to use. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression '' + with config.services.matrix-synapse.package.plugins; [ + matrix-synapse-ldap3 + matrix-synapse-pam + ]; + ''; + description = '' + List of additional Matrix plugins to make available. + ''; + }; + + withJemalloc = mkOption { + type = types.bool; + default = false; + description = '' + Whether to preload jemalloc to reduce memory fragmentation and overall usage. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/matrix-synapse"; + description = '' + The directory where matrix-synapse stores its stateful data such as + certificates, media and uploads. + ''; + }; + + settings = mkOption { + default = {}; + description = '' + The primary synapse configuration. See the + sample configuration + for possible values. + + Secrets should be passed in by using the extraConfigFiles option. + ''; + type = with types; submodule { + freeformType = format.type; + options = { + # This is a reduced set of popular options and defaults + # Do not add every available option here, they can be specified + # by the user at their own discretion. This is a freeform type! + + server_name = mkOption { + type = types.str; + example = "example.com"; + default = config.networking.hostName; + defaultText = literalExpression "config.networking.hostName"; + description = '' + The domain name of the server, with optional explicit port. + This is used by remote servers to look up the server address. + This is also the last part of your UserID. + + The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. + ''; + }; + + enable_registration = mkOption { + type = types.bool; + default = false; + description = '' + Enable registration for new users. + ''; + }; + + registration_shared_secret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, allows registration by anyone who also has the shared + secret, even if registration is otherwise disabled. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + macaroon_secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret key for authentication tokens. If none is specified, + the registration_shared_secret is used, if one is given; otherwise, + a secret key is derived from the signing key. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + enable_metrics = mkOption { + type = types.bool; + default = false; + description = '' + Enable collection and rendering of performance metrics + ''; + }; + + report_stats = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to report anonymized homeserver usage statistics. + ''; + }; + + signing_key_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/homeserver.signing.key"; + description = '' + Path to the signing key to sign messages with. + ''; + }; + + pid_file = mkOption { + type = types.path; + default = "/run/matrix-synapse.pid"; + readOnly = true; + description = '' + The file to store the PID in. + ''; + }; + + log_config = mkOption { + type = types.path; + default = ./matrix-synapse-log_config.yaml; + description = '' + The file that holds the logging configuration. + ''; + }; + + media_store_path = mkOption { + type = types.path; + default = if lib.versionAtLeast config.system.stateVersion "22.05" + then "${cfg.dataDir}/media_store" + else "${cfg.dataDir}/media"; + description = '' + Directory where uploaded images and attachments are stored. + ''; + }; + + public_baseurl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com:8448/"; + description = '' + The public-facing base URL for the client API (not including _matrix/...) + ''; + }; + + tls_certificate_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/fullchain.pem"; + description = '' + PEM encoded X509 certificate for TLS. + You can replace the self-signed certificate that synapse + autogenerates on launch with your own SSL certificate + key pair + if you like. Any required intermediary certificates can be + appended after the primary certificate in hierarchical order. + ''; + }; + + tls_private_key_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/key.pem"; + description = '' + PEM encoded private key for TLS. Specify null if synapse is not + speaking TLS directly. + ''; + }; + + presence.enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable presence tracking. + + Presence tracking allows users to see the state (e.g online/offline) + of other local and remote users. + ''; + }; + + listeners = mkOption { + type = types.listOf (types.submodule { + options = { + port = mkOption { + type = types.port; + example = 8448; + description = '' + The port to listen for HTTP(S) requests on. + ''; + }; + + bind_addresses = mkOption { + type = types.listOf types.str; + default = [ + "::1" + "127.0.0.1" + ]; + example = literalExpression '' + [ + "::" + "0.0.0.0" + ] + ''; + description = '' + IP addresses to bind the listener to. + ''; + }; + + type = mkOption { + type = types.enum [ + "http" + "manhole" + "metrics" + "replication" + ]; + default = "http"; + example = "metrics"; + description = '' + The type of the listener, usually http. + ''; + }; + + tls = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable TLS on the listener socket. + ''; + }; + + x_forwarded = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Use the X-Forwarded-For (XFF) header as the client IP and not the + actual client IP. + ''; + }; + + resources = mkOption { + type = types.listOf (types.submodule { + options = { + names = mkOption { + type = types.listOf (types.enum [ + "client" + "consent" + "federation" + "keys" + "media" + "metrics" + "openid" + "replication" + "static" + ]); + description = '' + List of resources to host on this listener. + ''; + example = [ + "client" + ]; + }; + compress = mkOption { + type = types.bool; + description = '' + Should synapse compress HTTP responses to clients that support it? + This should be disabled if running synapse behind a load balancer + that can do automatic compression. + ''; + }; + }; + }); + description = '' + List of HTTP resources to serve on this listener. + ''; + }; + }; + }); + default = [ { + port = 8008; + bind_addresses = [ "127.0.0.1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + description = '' + List of ports that Synapse should listen on, their purpose and their configuration. + ''; + }; + + database.name = mkOption { + type = types.enum [ + "sqlite3" + "psycopg2" + ]; + default = if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3"; + defaultText = literalExpression '' + if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3" + ''; + description = '' + The database engine name. Can be sqlite3 or psycopg2. + ''; + }; + + database.args.database = mkOption { + type = types.str; + default = { + sqlite3 = "${cfg.dataDir}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + defaultText = literalExpression '' + { + sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.''${${options.services.matrix-synapse.settings}.database.name}; + ''; + description = '' + Name of the database when using the psycopg2 backend, + path to the database location when using sqlite3. + ''; + }; + + database.args.user = mkOption { + type = types.nullOr types.str; + default = { + sqlite3 = null; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + description = '' + Username to connect with psycopg2, set to null + when using sqlite3. + ''; + }; + + url_preview_enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Is the preview URL API enabled? If enabled, you *must* specify an + explicit url_preview_ip_range_blacklist of IPs that the spider is + denied from accessing. + ''; + }; + + url_preview_ip_range_blacklist = mkOption { + type = types.listOf types.str; + default = [ + "10.0.0.0/8" + "100.64.0.0/10" + "127.0.0.0/8" + "169.254.0.0/16" + "172.16.0.0/12" + "192.0.0.0/24" + "192.0.2.0/24" + "192.168.0.0/16" + "192.88.99.0/24" + "198.18.0.0/15" + "198.51.100.0/24" + "2001:db8::/32" + "203.0.113.0/24" + "224.0.0.0/4" + "::1/128" + "fc00::/7" + "fe80::/10" + "fec0::/10" + "ff00::/8" + ]; + description = '' + List of IP address CIDR ranges that the URL preview spider is denied + from accessing. + ''; + }; + + url_preview_ip_range_whitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is allowed + to access even if they are specified in url_preview_ip_range_blacklist. + ''; + }; + + url_preview_url_blacklist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Optional list of URL matches that the URL preview spider is + denied from accessing. + ''; + }; + + max_upload_size = mkOption { + type = types.str; + default = "50M"; + example = "100M"; + description = '' + The largest allowed upload size in bytes + ''; + }; + + max_image_pixels = mkOption { + type = types.str; + default = "32M"; + example = "64M"; + description = '' + Maximum number of pixels that will be thumbnailed + ''; + }; + + dynamic_thumbnails = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to generate new thumbnails on the fly to precisely match + the resolution requested by the client. If true then whenever + a new resolution is requested by the client the server will + generate a new thumbnail. If false the server will pick a thumbnail + from a precalculated list. + ''; + }; + + turn_uris = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "turn:turn.example.com:3487?transport=udp" + "turn:turn.example.com:3487?transport=tcp" + "turns:turn.example.com:5349?transport=udp" + "turns:turn.example.com:5349?transport=tcp" + ]; + description = '' + The public URIs of the TURN server to give to clients + ''; + }; + turn_shared_secret = mkOption { + type = types.str; + default = ""; + example = literalExpression '' + config.services.coturn.static-auth-secret + ''; + description = '' + The shared secret used to compute passwords for the TURN server. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + trusted_key_servers = mkOption { + type = types.listOf (types.submodule { + options = { + server_name = mkOption { + type = types.str; + example = "matrix.org"; + description = '' + Hostname of the trusted server. + ''; + }; + + verify_keys = mkOption { + type = types.nullOr (types.attrsOf types.str); + default = null; + example = literalExpression '' + { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + } + ''; + description = '' + Attribute set from key id to base64 encoded public key. + + If specified synapse will check that the response is signed + by at least one of the given keys. + ''; + }; + }; + }); + default = [ { + server_name = "matrix.org"; + verify_keys = { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + }; + } ]; + description = '' + The trusted servers to download signing keys from. + ''; + }; + + app_service_config_files = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of application service config file to use + ''; + }; + + }; + }; + }; + + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config-path. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOps is in use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; + message = '' + Cannot deploy matrix-synapse with a configuration for a local postgresql database + and a missing postgresql service. Since 20.03 it's mandatory to manually configure the + database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for + further reference). + + If you + - try to deploy a fresh synapse, you need to configure the database yourself. An example + for this can be found in + - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` + to your configuration. + + For further information about this update, please read the release-notes of 20.03 carefully. + ''; + } + ]; + + services.matrix-synapse.configFile = configFile; + + users.users.matrix-synapse = { + group = "matrix-synapse"; + home = cfg.dataDir; + createHome = true; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.matrix-synapse; + }; + + users.groups.matrix-synapse = { + gid = config.ids.gids.matrix-synapse; + }; + + systemd.services.matrix-synapse = { + description = "Synapse Matrix homeserver"; + after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ${cfg.package}/bin/synapse_homeserver \ + --config-path ${configFile} \ + --keys-directory ${cfg.dataDir} \ + --generate-keys + ''; + environment = { + PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; + } // optionalAttrs (cfg.withJemalloc) { + LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + }; + serviceConfig = { + Type = "notify"; + User = "matrix-synapse"; + Group = "matrix-synapse"; + WorkingDirectory = cfg.dataDir; + ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' + chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key + chmod 0600 ${cfg.dataDir}/homeserver.signing.key + '')) ]; + ExecStart = '' + ${cfg.package}/bin/synapse_homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + UMask = "0077"; + }; + }; + + environment.systemPackages = [ registerNewMatrixUser ]; + }; + + meta = { + buildDocsInSandbox = false; + doc = ./matrix-synapse.xml; + maintainers = teams.matrix.members; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.xml similarity index 85% rename from third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml rename to third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.xml index 41a56df0f2..cdc4b4de1a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.xml +++ b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-synapse.xml @@ -115,20 +115,21 @@ in { }; services.matrix-synapse = { enable = true; - server_name = config.networking.domain; - listeners = [ + server_name = config.networking.domain; + listeners = [ { - port = 8008; - bind_address = "::1"; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { - names = [ "client" "federation" ]; - compress = false; - } - ]; + port = 8008; + bind_address = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; } ]; }; @@ -151,11 +152,11 @@ in { If you want to run a server with public registration by anybody, you can - then enable services.matrix-synapse.enable_registration = + then enable services.matrix-synapse.enable_registration = true;. Otherwise, or you can generate a registration secret with pwgen -s 64 1 and set it with - . To - create a new user or admin, run the following after you have set the secret + . + To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: $ nix run nixpkgs.matrix-synapse @@ -170,7 +171,7 @@ Success! @your-username:example.org. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the - registration_shared_secret + registration_shared_secret option until a better solution for NixOS is in place. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix deleted file mode 100644 index feca4c5465..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ /dev/null @@ -1,844 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.matrix-synapse; - opt = options.services.matrix-synapse; - pg = config.services.postgresql; - usePostgresql = cfg.database_type == "psycopg2"; - logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; - pluginsEnv = cfg.package.python.buildEnv.override { - extraLibs = cfg.plugins; - }; - configFile = pkgs.writeText "homeserver.yaml" '' -${optionalString (cfg.tls_certificate_path != null) '' -tls_certificate_path: "${cfg.tls_certificate_path}" -''} -${optionalString (cfg.tls_private_key_path != null) '' -tls_private_key_path: "${cfg.tls_private_key_path}" -''} -${optionalString (cfg.tls_dh_params_path != null) '' -tls_dh_params_path: "${cfg.tls_dh_params_path}" -''} -no_tls: ${boolToString cfg.no_tls} -${optionalString (cfg.bind_port != null) '' -bind_port: ${toString cfg.bind_port} -''} -${optionalString (cfg.unsecure_port != null) '' -unsecure_port: ${toString cfg.unsecure_port} -''} -${optionalString (cfg.bind_host != null) '' -bind_host: "${cfg.bind_host}" -''} -server_name: "${cfg.server_name}" -pid_file: "/run/matrix-synapse.pid" -${optionalString (cfg.public_baseurl != null) '' -public_baseurl: "${cfg.public_baseurl}" -''} -listeners: [${concatStringsSep "," (map mkListener cfg.listeners)}] -database: { - name: "${cfg.database_type}", - args: { - ${concatStringsSep ",\n " ( - mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args - )} - } -} -event_cache_size: "${cfg.event_cache_size}" -verbose: ${cfg.verbose} -log_config: "${logConfigFile}" -rc_messages_per_second: ${cfg.rc_messages_per_second} -rc_message_burst_count: ${cfg.rc_message_burst_count} -federation_rc_window_size: ${cfg.federation_rc_window_size} -federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit} -federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay} -federation_rc_reject_limit: ${cfg.federation_rc_reject_limit} -federation_rc_concurrent: ${cfg.federation_rc_concurrent} -media_store_path: "${cfg.dataDir}/media" -uploads_path: "${cfg.dataDir}/uploads" -max_upload_size: "${cfg.max_upload_size}" -max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails} -url_preview_enabled: ${boolToString cfg.url_preview_enabled} -${optionalString (cfg.url_preview_enabled == true) '' -url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} -url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} -url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} -''} -recaptcha_private_key: "${cfg.recaptcha_private_key}" -recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${boolToString cfg.enable_registration_captcha} -turn_uris: ${builtins.toJSON cfg.turn_uris} -turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${boolToString cfg.enable_registration} -${optionalString (cfg.registration_shared_secret != null) '' -registration_shared_secret: "${cfg.registration_shared_secret}" -''} -recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" -turn_user_lifetime: "${cfg.turn_user_lifetime}" -user_creation_max_duration: ${cfg.user_creation_max_duration} -bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: ${boolToString cfg.allow_guest_access} - -account_threepid_delegates: - ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"} - ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"} - -room_prejoin_state: - disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types} - additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types} -${optionalString (cfg.macaroon_secret_key != null) '' - macaroon_secret_key: "${cfg.macaroon_secret_key}" -''} -expire_access_token: ${boolToString cfg.expire_access_token} -enable_metrics: ${boolToString cfg.enable_metrics} -report_stats: ${boolToString cfg.report_stats} -signing_key_path: "${cfg.dataDir}/homeserver.signing.key" -key_refresh_interval: "${cfg.key_refresh_interval}" -perspectives: - servers: { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "verify_keys": { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "key": "${v}" - }'') v)} - } - '') cfg.servers)} - } - } -redaction_retention_period: ${toString cfg.redaction_retention_period} -app_service_config_files: ${builtins.toJSON cfg.app_service_config_files} - -${cfg.extraConfig} -''; - - hasLocalPostgresDB = let args = cfg.database_args; in - usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); - - registerNewMatrixUser = - let - isIpv6 = x: lib.length (lib.splitString ":" x) > 1; - listener = - lib.findFirst ( - listener: lib.any ( - resource: lib.any ( - name: name == "client" - ) resource.names - ) listener.resources - ) (lib.last cfg.listeners) cfg.listeners; - in - pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' - exec ${cfg.package}/bin/register_new_matrix_user \ - $@ \ - ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ - "${listener.type}://${ - if (isIpv6 listener.bind_address) then - "[${listener.bind_address}]" - else - "${listener.bind_address}" - }:${builtins.toString listener.port}/" - ''; -in { - options = { - services.matrix-synapse = { - enable = mkEnableOption "matrix.org synapse"; - configFile = mkOption { - type = types.str; - readOnly = true; - description = '' - Path to the configuration file on the target system. Useful to configure e.g. workers - that also need this. - ''; - }; - package = mkOption { - type = types.package; - default = pkgs.matrix-synapse; - defaultText = literalExpression "pkgs.matrix-synapse"; - description = '' - Overridable attribute of the matrix synapse server package to use. - ''; - }; - plugins = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExpression '' - with config.services.matrix-synapse.package.plugins; [ - matrix-synapse-ldap3 - matrix-synapse-pam - ]; - ''; - description = '' - List of additional Matrix plugins to make available. - ''; - }; - withJemalloc = mkOption { - type = types.bool; - default = false; - description = '' - Whether to preload jemalloc to reduce memory fragmentation and overall usage. - ''; - }; - no_tls = mkOption { - type = types.bool; - default = false; - description = '' - Don't bind to the https port - ''; - }; - bind_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8448; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTPS requests on. - For when matrix traffic is sent directly to synapse. - ''; - }; - unsecure_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8008; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTP requests on. - For when matrix traffic passes through loadbalancer that unwraps TLS. - ''; - }; - bind_host = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - DEPRECATED: Use listeners instead. - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - tls_certificate_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.crt"; - description = '' - PEM encoded X509 certificate for TLS. - You can replace the self-signed certificate that synapse - autogenerates on launch with your own SSL certificate + key pair - if you like. Any required intermediary certificates can be - appended after the primary certificate in hierarchical order. - ''; - }; - tls_private_key_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.key"; - description = '' - PEM encoded private key for TLS. Specify null if synapse is not - speaking TLS directly. - ''; - }; - tls_dh_params_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.dh"; - description = '' - PEM dh parameters for ephemeral keys - ''; - }; - server_name = mkOption { - type = types.str; - example = "example.com"; - default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; - description = '' - The domain name of the server, with optional explicit port. - This is used by remote servers to look up the server address. - This is also the last part of your UserID. - - The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. - ''; - }; - public_baseurl = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://example.com:8448/"; - description = '' - The public-facing base URL for the client API (not including _matrix/...) - ''; - }; - listeners = mkOption { - type = types.listOf (types.submodule { - options = { - port = mkOption { - type = types.port; - example = 8448; - description = '' - The port to listen for HTTP(S) requests on. - ''; - }; - bind_address = mkOption { - type = types.str; - default = ""; - example = "203.0.113.42"; - description = '' - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - type = mkOption { - type = types.str; - default = "http"; - description = '' - Type of listener. - ''; - }; - tls = mkOption { - type = types.bool; - default = true; - description = '' - Whether to listen for HTTPS connections rather than HTTP. - ''; - }; - x_forwarded = mkOption { - type = types.bool; - default = false; - description = '' - Use the X-Forwarded-For (XFF) header as the client IP and not the - actual client IP. - ''; - }; - resources = mkOption { - type = types.listOf (types.submodule { - options = { - names = mkOption { - type = types.listOf types.str; - description = '' - List of resources to host on this listener. - ''; - example = ["client" "federation"]; - }; - compress = mkOption { - type = types.bool; - description = '' - Should synapse compress HTTP responses to clients that support it? - This should be disabled if running synapse behind a load balancer - that can do automatic compression. - ''; - }; - }; - }); - description = '' - List of HTTP resources to serve on this listener. - ''; - }; - }; - }); - default = [{ - port = 8448; - bind_address = ""; - type = "http"; - tls = true; - x_forwarded = false; - resources = [ - { names = ["client"]; compress = true; } - { names = ["federation"]; compress = false; } - ]; - }]; - description = '' - List of ports that Synapse should listen on, their purpose and their configuration. - ''; - }; - verbose = mkOption { - type = types.str; - default = "0"; - description = "Logging verbosity level."; - }; - rc_messages_per_second = mkOption { - type = types.str; - default = "0.2"; - description = "Number of messages a client can send per second"; - }; - rc_message_burst_count = mkOption { - type = types.str; - default = "10.0"; - description = "Number of message a client can send before being throttled"; - }; - federation_rc_window_size = mkOption { - type = types.str; - default = "1000"; - description = "The federation window size in milliseconds"; - }; - federation_rc_sleep_limit = mkOption { - type = types.str; - default = "10"; - description = '' - The number of federation requests from a single server in a window - before the server will delay processing the request. - ''; - }; - federation_rc_sleep_delay = mkOption { - type = types.str; - default = "500"; - description = '' - The duration in milliseconds to delay processing events from - remote servers by if they go over the sleep limit. - ''; - }; - federation_rc_reject_limit = mkOption { - type = types.str; - default = "50"; - description = '' - The maximum number of concurrent federation requests allowed - from a single server - ''; - }; - federation_rc_concurrent = mkOption { - type = types.str; - default = "3"; - description = "The number of federation requests to concurrently process from a single server"; - }; - database_type = mkOption { - type = types.enum [ "sqlite3" "psycopg2" ]; - default = if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3"; - defaultText = literalExpression '' - if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3" - ''; - description = '' - The database engine name. Can be sqlite or psycopg2. - ''; - }; - database_name = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database name."; - }; - database_user = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database user name."; - }; - database_args = mkOption { - type = types.attrs; - default = { - sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; }; - psycopg2 = { - user = cfg.database_user; - database = cfg.database_name; - }; - }.${cfg.database_type}; - defaultText = literalDocBook '' - - - using sqlite3 - - - { database = "''${config.${opt.dataDir}}/homeserver.db"; } - - - - - using psycopg2 - - - psycopg2 = { - user = config.${opt.database_user}; - database = config.${opt.database_name}; - } - - - - - ''; - description = '' - Arguments to pass to the engine. - ''; - }; - event_cache_size = mkOption { - type = types.str; - default = "10K"; - description = "Number of events to cache in memory."; - }; - url_preview_enabled = mkOption { - type = types.bool; - default = false; - description = '' - Is the preview URL API enabled? If enabled, you *must* specify an - explicit url_preview_ip_range_blacklist of IPs that the spider is - denied from accessing. - ''; - }; - url_preview_ip_range_blacklist = mkOption { - type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - "::1/128" - "fe80::/64" - "fc00::/7" - ]; - description = '' - List of IP address CIDR ranges that the URL preview spider is denied - from accessing. - ''; - }; - url_preview_ip_range_whitelist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - List of IP address CIDR ranges that the URL preview spider is allowed - to access even if they are specified in - url_preview_ip_range_blacklist. - ''; - }; - url_preview_url_blacklist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Optional list of URL matches that the URL preview spider is - denied from accessing. - ''; - }; - recaptcha_private_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA private key. - ''; - }; - recaptcha_public_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA public key. - ''; - }; - enable_registration_captcha = mkOption { - type = types.bool; - default = false; - description = '' - Enables ReCaptcha checks when registering, preventing signup - unless a captcha is answered. Requires a valid ReCaptcha - public/private key. - ''; - }; - turn_uris = mkOption { - type = types.listOf types.str; - default = []; - description = '' - The public URIs of the TURN server to give to clients - ''; - }; - turn_shared_secret = mkOption { - type = types.str; - default = ""; - description = '' - The shared secret used to compute passwords for the TURN server - ''; - }; - turn_user_lifetime = mkOption { - type = types.str; - default = "1h"; - description = "How long generated TURN credentials last"; - }; - enable_registration = mkOption { - type = types.bool; - default = false; - description = '' - Enable registration for new users. - ''; - }; - registration_shared_secret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - If set, allows registration by anyone who also has the shared - secret, even if registration is otherwise disabled. - ''; - }; - enable_metrics = mkOption { - type = types.bool; - default = false; - description = '' - Enable collection and rendering of performance metrics - ''; - }; - report_stats = mkOption { - type = types.bool; - default = false; - description = ""; - }; - servers = mkOption { - type = types.attrsOf (types.attrsOf types.str); - default = { - "matrix.org" = { - "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; - }; - }; - description = '' - The trusted servers to download signing keys from. - ''; - }; - max_upload_size = mkOption { - type = types.str; - default = "10M"; - description = "The largest allowed upload size in bytes"; - }; - max_image_pixels = mkOption { - type = types.str; - default = "32M"; - description = "Maximum number of pixels that will be thumbnailed"; - }; - dynamic_thumbnails = mkOption { - type = types.bool; - default = false; - description = '' - Whether to generate new thumbnails on the fly to precisely match - the resolution requested by the client. If true then whenever - a new resolution is requested by the client the server will - generate a new thumbnail. If false the server will pick a thumbnail - from a precalculated list. - ''; - }; - user_creation_max_duration = mkOption { - type = types.str; - default = "1209600000"; - description = '' - Sets the expiry for the short term user creation in - milliseconds. The default value is two weeks. - ''; - }; - bcrypt_rounds = mkOption { - type = types.str; - default = "12"; - description = '' - Set the number of bcrypt rounds used to generate password hash. - Larger numbers increase the work factor needed to generate the hash. - ''; - }; - allow_guest_access = mkOption { - type = types.bool; - default = false; - description = '' - Allows users to register as guests without a password/email/etc, and - participate in rooms hosted on this server which have been made - accessible to anonymous users. - ''; - }; - account_threepid_delegates.email = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate email sending to https://example.org - ''; - }; - account_threepid_delegates.msisdn = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate SMS sending to this local process (https://localhost:8090) - ''; - }; - room_prejoin_state.additional_event_types = mkOption { - default = []; - type = types.listOf types.str; - description = '' - Additional events to share with users who received an invite. - ''; - }; - room_prejoin_state.disable_default_event_types = mkOption { - default = false; - type = types.bool; - description = '' - Whether to disable the default state-event types for users invited to a room. - These are: - - - m.room.join_rules - m.room.canonical_alias - m.room.avatar - m.room.encryption - m.room.name - m.room.create - - ''; - }; - macaroon_secret_key = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Secret key for authentication tokens - ''; - }; - expire_access_token = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable access token expiration. - ''; - }; - key_refresh_interval = mkOption { - type = types.str; - default = "1d"; - description = '' - How long key response published by this server is valid for. - Used to set the valid_until_ts in /key/v2 APIs. - Determines how quickly servers will query to check which keys - are still valid. - ''; - }; - app_service_config_files = mkOption { - type = types.listOf types.path; - default = [ ]; - description = '' - A list of application service config file to use - ''; - }; - redaction_retention_period = mkOption { - type = types.int; - default = 7; - description = '' - How long to keep redacted events in unredacted form in the database. - ''; - }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra config options for matrix-synapse. - ''; - }; - extraConfigFiles = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Extra config files to include. - - The configuration files will be included based on the command line - argument --config-path. This allows to configure secrets without - having to go through the Nix store, e.g. based on deployment keys if - NixOPS is in use. - ''; - }; - logConfig = mkOption { - type = types.lines; - default = readFile ./matrix-synapse-log_config.yaml; - description = '' - A yaml python logging config file - ''; - }; - dataDir = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse"; - description = '' - The directory where matrix-synapse stores its stateful data such as - certificates, media and uploads. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - assertions = [ - { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; - message = '' - Cannot deploy matrix-synapse with a configuration for a local postgresql database - and a missing postgresql service. Since 20.03 it's mandatory to manually configure the - database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for - further reference). - - If you - - try to deploy a fresh synapse, you need to configure the database yourself. An example - for this can be found in - - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` - to your configuration. - - For further information about this update, please read the release-notes of 20.03 carefully. - ''; - } - ]; - - services.matrix-synapse.configFile = "${configFile}"; - - users.users.matrix-synapse = { - group = "matrix-synapse"; - home = cfg.dataDir; - createHome = true; - shell = "${pkgs.bash}/bin/bash"; - uid = config.ids.uids.matrix-synapse; - }; - - users.groups.matrix-synapse = { - gid = config.ids.gids.matrix-synapse; - }; - - systemd.services.matrix-synapse = { - description = "Synapse Matrix homeserver"; - after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - ${cfg.package}/bin/synapse_homeserver \ - --config-path ${configFile} \ - --keys-directory ${cfg.dataDir} \ - --generate-keys - ''; - environment = { - PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; - } // optionalAttrs (cfg.withJemalloc) { - LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - }; - serviceConfig = { - Type = "notify"; - User = "matrix-synapse"; - Group = "matrix-synapse"; - WorkingDirectory = cfg.dataDir; - ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' - chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key - chmod 0600 ${cfg.dataDir}/homeserver.signing.key - '')) ]; - ExecStart = '' - ${cfg.package}/bin/synapse_homeserver \ - ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } - --keys-directory ${cfg.dataDir} - ''; - ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - UMask = "0077"; - }; - }; - - environment.systemPackages = [ registerNewMatrixUser ]; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' - The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 - as the behavior is now obsolete. - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' - Database configuration must be done manually. An exemplary setup is demonstrated in - - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") - (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' - You may add additional event types via - `services.matrix-synapse.room_prejoin_state.additional_event_types` and - disable the default events via - `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. - '') - ]; - - meta.doc = ./matrix-synapse.xml; - meta.maintainers = teams.matrix.members; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index ca59ea2937..2b21df91b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -730,6 +730,40 @@ in }; restartTriggers = [ nixConf ]; + + # `stopIfChanged = false` changes to switch behavior + # from stop -> update units -> start + # to update units -> restart + # + # The `stopIfChanged` setting therefore controls a trade-off between a + # more predictable lifecycle, which runs the correct "version" of + # the `ExecStop` line, and on the other hand the availability of + # sockets during the switch, as the effectiveness of the stop operation + # depends on the socket being stopped as well. + # + # As `nix-daemon.service` does not make use of `ExecStop`, we prefer + # to keep the socket up and available. This is important for machines + # that run Nix-based services, such as automated build, test, and deploy + # services, that expect the daemon socket to be available at all times. + # + # Notably, the Nix client does not retry on failure to connect to the + # daemon socket, and the in-process RemoteStore instance will disable + # itself. This makes retries infeasible even for services that are + # aware of the issue. Failure to connect can affect not only new client + # processes, but also new RemoteStore instances in existing processes, + # as well as existing RemoteStore instances that have not saturated + # their connection pool. + # + # Also note that `stopIfChanged = true` does not kill existing + # connection handling daemons, as one might wish to happen before a + # breaking Nix upgrade (which is rare). The daemon forks that handle + # the individual connections split off into their own sessions, causing + # them not to be stopped by systemd. + # If a Nix upgrade does require all existing daemon processes to stop, + # nix-daemon must do so on its own accord, and only when the new version + # starts and detects that Nix's persistent state needs an upgrade. + stopIfChanged = false; + }; # Set up the environment variables for running Nix. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix index 7000d45975..1cd8da768f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix @@ -55,6 +55,19 @@ in symlinks in Plex's plugin directory will be cleared and this module will symlink all of the paths specified here to that directory. ''; + example = literalExpression '' + [ + (builtins.path { + name = "Audnexus.bundle"; + path = pkgs.fetchFromGitHub { + owner = "djdembeck"; + repo = "Audnexus.bundle"; + rev = "v0.2.8"; + sha256 = "sha256-IWOSz3vYL7zhdHan468xNc6C/eQ2C2BukQlaJNLXh7E="; + }; + }) + ] + ''; }; extraScanners = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index b311b91b4a..17da020bf3 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -259,7 +259,7 @@ in ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + optionalString cfg.autoMigrate '' - ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y + ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' ipfs --offline config show \ | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix index fc06cdaa6e..3049c4f2bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix @@ -3,103 +3,101 @@ let inherit (lib) mkEnableOption mkIf mkOption optionalString types; - generic = variant: - let - cfg = config.services.${variant}; - pkg = pkgs.${variant}; - birdBin = if variant == "bird6" then "bird6" else "bird"; - birdc = if variant == "bird6" then "birdc6" else "birdc"; - descr = - { bird = "1.6.x with IPv4 support"; - bird6 = "1.6.x with IPv6 support"; - bird2 = "2.x"; - }.${variant}; - in { - ###### interface - options = { - services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; - config = mkOption { - type = types.lines; - description = '' - BIRD Internet Routing Daemon configuration file. - - ''; - }; - checkConfig = mkOption { - type = types.bool; - default = true; - description = '' - Whether the config should be checked at build time. - When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create - the included files before checking. - ''; - }; - preCheckConfig = mkOption { - type = types.lines; - default = ""; - example = '' - echo "cost 100;" > include.conf - ''; - description = '' - Commands to execute before the config file check. The file to be checked will be - available as ${variant}.conf in the current directory. - - Files created with this option will not be available at service runtime, only during - build time checking. - ''; - }; - }; + cfg = config.services.bird2; + caps = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" ]; +in +{ + ###### interface + options = { + services.bird2 = { + enable = mkEnableOption "BIRD Internet Routing Daemon"; + config = mkOption { + type = types.lines; + description = '' + BIRD Internet Routing Daemon configuration file. + + ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + Whether the config should be checked at build time. + When the config can't be checked during build time, for example when it includes + other files, either disable this option or use preCheckConfig to create + the included files before checking. + ''; + }; + preCheckConfig = mkOption { + type = types.lines; + default = ""; + example = '' + echo "cost 100;" > include.conf + ''; + description = '' + Commands to execute before the config file check. The file to be checked will be + available as bird2.conf in the current directory. - ###### implementation - config = mkIf cfg.enable { - environment.systemPackages = [ pkg ]; - - environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile { - name = "${variant}.conf"; - text = cfg.config; - checkPhase = optionalString cfg.checkConfig '' - ln -s $out ${variant}.conf - ${cfg.preCheckConfig} - ${pkg}/bin/${birdBin} -d -p -c ${variant}.conf - ''; - }; - - systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon (${descr})"; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - restartTriggers = [ config.environment.etc."bird/${variant}.conf".source ]; - serviceConfig = { - Type = "forking"; - Restart = "on-failure"; - ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}"; - ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'"; - ExecStop = "${pkg}/bin/${birdc} down"; - CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" - # see bird/sysdep/linux/syspriv.h - "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ]; - ProtectSystem = "full"; - ProtectHome = "yes"; - SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; - MemoryDenyWriteExecute = "yes"; - }; - }; - users = { - users.${variant} = { - description = "BIRD Internet Routing Daemon user"; - group = variant; - isSystemUser = true; - }; - groups.${variant} = {}; - }; + Files created with this option will not be available at service runtime, only during + build time checking. + ''; }; }; + }; -in -{ - imports = map generic [ "bird" "bird6" "bird2" ]; + imports = [ + (lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead") + (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead") + ]; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.bird ]; + + environment.etc."bird/bird2.conf".source = pkgs.writeTextFile { + name = "bird2"; + text = cfg.config; + checkPhase = optionalString cfg.checkConfig '' + ln -s $out bird2.conf + ${cfg.preCheckConfig} + ${pkgs.bird}/bin/bird -d -p -c bird2.conf + ''; + }; + + systemd.services.bird2 = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ config.environment.etc."bird/bird2.conf".source ]; + serviceConfig = { + Type = "forking"; + Restart = "on-failure"; + User = "bird2"; + Group = "bird2"; + ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf"; + ExecReload = "${pkgs.bird}/bin/birdc configure"; + ExecStop = "${pkgs.bird}/bin/birdc down"; + RuntimeDirectory = "bird"; + CapabilityBoundingSet = caps; + AmbientCapabilities = caps; + ProtectSystem = "full"; + ProtectHome = "yes"; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + SystemCallFilter = "~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; + MemoryDenyWriteExecute = "yes"; + }; + }; + users = { + users.bird2 = { + description = "BIRD Internet Routing Daemon user"; + group = "bird2"; + isSystemUser = true; + }; + groups.bird2 = { }; + }; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index 992678c43e..06ec04dbbf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -306,7 +306,7 @@ in Type = if forking then "forking" else "simple"; PIDFile = mkIf forking "/run/murmur/murmurd.pid"; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini"; + ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index a9801036b0..7a9d9e5428 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -556,6 +556,7 @@ in { boot.kernelModules = [ "ctr" ]; + security.polkit.enable = true; security.polkit.extraConfig = polkitConf; services.dbus.packages = cfg.packages diff --git a/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix new file mode 100644 index 0000000000..2124644ed9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.snowflake-proxy; +in +{ + options = { + services.snowflake-proxy = { + enable = mkEnableOption "System to defeat internet censorship"; + + broker = mkOption { + description = "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; + type = with types; nullOr str; + default = null; + }; + + capacity = mkOption { + description = "Limits the amount of maximum concurrent clients allowed."; + type = with types; nullOr int; + default = null; + }; + + relay = mkOption { + description = "websocket relay URL (default \"wss://snowflake.bamsoftware.com/\")"; + type = with types; nullOr str; + default = null; + }; + + stun = mkOption { + description = "STUN broker URL (default \"stun:stun.stunprotocol.org:3478\")"; + type = with types; nullOr str; + default = null; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.snowflake-proxy = { + wantedBy = [ "network-online.target" ]; + serviceConfig = { + ExecStart = + "${pkgs.snowflake}/bin/proxy " + concatStringsSep " " ( + optional (cfg.broker != null) "-broker ${cfg.broker}" + ++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}" + ++ optional (cfg.relay != null) "-relay ${cfg.relay}" + ++ optional (cfg.stun != null) "-stun ${cfg.stun}" + ); + + # Security Hardening + # Refer to systemd.exec(5) for option descriptions. + CapabilityBoundingSet = ""; + + # implies RemoveIPC=, PrivateTmp=, NoNewPrivileges=, RestrictSUIDSGID=, + # ProtectSystem=strict, ProtectHome=read-only + DynamicUser = true; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @cpu-emulation @debug @mount @obsolete @reboot @swap @privileged @resources"; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with maintainers; [ yayayayaka ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tetrd.nix b/third_party/nixpkgs/nixos/modules/services/networking/tetrd.nix index ead73c4977..0801ce1292 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tetrd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tetrd.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - options.services.tetrd.enable = lib.mkEnableOption pkgs.tetrd.meta.description; + options.services.tetrd.enable = lib.mkEnableOption "tetrd"; config = lib.mkIf config.services.tetrd.enable { environment = { diff --git a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix index 340cbbf02f..95a0ad8770 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix @@ -9,7 +9,7 @@ let pkg = pkgs.clamav; toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault {} " "; + mkKeyValue = generators.mkKeyValueDefault { } " "; listsAsDuplicateKeys = true; }; @@ -30,7 +30,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' ClamAV configuration. Refer to , for details on supported values. @@ -59,7 +59,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' freshclam configuration. Refer to , for details on supported values. @@ -104,7 +104,6 @@ in systemd.services.clamav-daemon = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; after = optional cfg.updater.enable "clamav-freshclam.service"; - requires = optional cfg.updater.enable "clamav-freshclam.service"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; @@ -134,7 +133,7 @@ in systemd.services.clamav-freshclam = mkIf cfg.updater.enable { description = "ClamAV virus database updater (freshclam)"; restartTriggers = [ freshclamConfigFile ]; - + after = [ "network-online.target" ]; preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} diff --git a/third_party/nixpkgs/nixos/modules/services/security/fprot.nix b/third_party/nixpkgs/nixos/modules/services/security/fprot.nix deleted file mode 100644 index df60d553e8..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/security/fprot.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - fprotUser = "fprot"; - stateDir = "/var/lib/fprot"; - fprotGroup = fprotUser; - cfg = config.services.fprot; -in { - options = { - - services.fprot = { - updater = { - enable = mkEnableOption "automatic F-Prot virus definitions database updates"; - - productData = mkOption { - description = '' - product.data file. Defaults to the one supplied with installation package. - ''; - type = types.path; - }; - - frequency = mkOption { - default = 30; - type = types.int; - description = '' - Update virus definitions every X minutes. - ''; - }; - - licenseKeyfile = mkOption { - type = types.path; - description = '' - License keyfile. Defaults to the one supplied with installation package. - ''; - }; - - }; - }; - }; - - ###### implementation - - config = mkIf cfg.updater.enable { - - services.fprot.updater.productData = mkDefault "${pkgs.fprot}/opt/f-prot/product.data"; - services.fprot.updater.licenseKeyfile = mkDefault "${pkgs.fprot}/opt/f-prot/license.key"; - - environment.systemPackages = [ pkgs.fprot ]; - environment.etc."f-prot.conf" = { - source = "${pkgs.fprot}/opt/f-prot/f-prot.conf"; - }; - - users.users.${fprotUser} = - { uid = config.ids.uids.fprot; - description = "F-Prot daemon user"; - home = stateDir; - }; - - users.groups.${fprotGroup} = - { gid = config.ids.gids.fprot; }; - - services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ]; - - systemd.services.fprot-updater = { - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = false; - }; - wantedBy = [ "multi-user.target" ]; - - # have to copy fpupdate executable because it insists on storing the virus database in the same dir - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${fprotUser}:${fprotGroup} ${stateDir} - cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir} - ln -sf ${cfg.updater.productData} ${stateDir}/product.data - ''; - - script = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}"; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix index 919346cf2b..f9b4985e19 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix @@ -3,22 +3,123 @@ with lib; let - name = "opensnitch"; cfg = config.services.opensnitch; + format = pkgs.formats.json {}; in { options = { services.opensnitch = { enable = mkEnableOption "Opensnitch application firewall"; + settings = mkOption { + type = types.submodule { + freeformType = format.type; + + options = { + Server = { + + Address = mkOption { + type = types.str; + description = '' + Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is + mandatory) or TCP socket (192.168.1.100:50051). + ''; + }; + + LogFile = mkOption { + type = types.path; + description = '' + File to write logs to (use /dev/stdout to write logs to standard + output). + ''; + }; + + }; + + DefaultAction = mkOption { + type = types.enum [ "allow" "deny" ]; + description = '' + Default action whether to block or allow application internet + access. + ''; + }; + + DefaultDuration = mkOption { + type = types.enum [ + "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" + ]; + description = '' + Default duration of firewall rule. + ''; + }; + + InterceptUnknown = mkOption { + type = types.bool; + description = '' + Wheter to intercept spare connections. + ''; + }; + + ProcMonitorMethod = mkOption { + type = types.enum [ "ebpf" "proc" "ftrace" "audit" ]; + description = '' + Which process monitoring method to use. + ''; + }; + + LogLevel = mkOption { + type = types.enum [ 0 1 2 3 4 ]; + description = '' + Default log level from 0 to 4 (debug, info, important, warning, + error). + ''; + }; + + Firewall = mkOption { + type = types.enum [ "iptables" "nftables" ]; + description = '' + Which firewall backend to use. + ''; + }; + + Stats = { + + MaxEvents = mkOption { + type = types.int; + description = '' + Max events to send to the GUI. + ''; + }; + + MaxStats = mkOption { + type = types.int; + description = '' + Max stats per item to keep in backlog. + ''; + }; + + }; + }; + }; + description = '' + opensnitchd configuration. Refer to + + for details on supported values. + ''; + }; }; }; config = mkIf cfg.enable { + # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected + services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/default-config.json"))); + systemd = { packages = [ pkgs.opensnitch ]; services.opensnitchd.wantedBy = [ "multi-user.target" ]; }; + environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix index db7f81acd2..95183078d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix @@ -106,6 +106,9 @@ in ConditionFileNotEmpty = ""; # override upstream }; serviceConfig = { + User = "step-ca"; + Group = "step-ca"; + UMask = "0077"; Environment = "HOME=%S/step-ca"; WorkingDirectory = ""; # override upstream ReadWriteDirectories = ""; # override upstream @@ -127,6 +130,14 @@ in }; }; + users.users.step-ca = { + home = "/var/lib/step-ca"; + group = "step-ca"; + isSystemUser = true; + }; + + users.groups.step-ca = {}; + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index fd459f70cc..8277f49363 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -151,7 +151,7 @@ in { }; systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs" ]; + aliases = [ "backup-bitwarden_rs.service" ]; description = "Backup vaultwarden"; environment = { DATA_FOLDER = "/var/lib/bitwarden_rs"; @@ -169,7 +169,7 @@ in { }; systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs" ]; + aliases = [ "backup-bitwarden_rs.service" ]; description = "Backup vaultwarden on time"; timerConfig = { OnCalendar = mkDefault "23:00"; diff --git a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix index 452efc7364..b355df056b 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix @@ -39,20 +39,12 @@ in ''; }; - useKernelOOMKiller= mkOption { - type = types.bool; - default = false; - description = '' - Use kernel OOM killer instead of own user-space implementation. - ''; - }; - + # TODO: remove or warn after 1.7 (https://github.com/rfjakob/earlyoom/commit/7ebc4554) ignoreOOMScoreAdjust = mkOption { type = types.bool; default = false; description = '' Ignore oom_score_adjust values of processes. - User-space implementation only. ''; }; @@ -87,16 +79,21 @@ in }; }; + imports = [ + (mkRemovedOptionModule [ "services" "earlyoom" "useKernelOOMKiller" ] '' + This option is deprecated and ignored by earlyoom since 1.2. + '') + ]; + config = mkIf ecfg.enable { assertions = [ { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; message = "Needs to be a positive percentage"; } { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; message = "Needs to be a positive percentage"; } - { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust; - message = "Both options in conjunction do not make sense"; } ]; + # TODO: reimplement this option as -N after 1.7 (https://github.com/rfjakob/earlyoom/commit/afe03606) warnings = optional (ecfg.notificationsCommand != null) "`services.earlyoom.notificationsCommand` is deprecated and ignored by earlyoom since 1.6."; @@ -107,15 +104,13 @@ in serviceConfig = { StandardOutput = "null"; StandardError = "journal"; - ExecStart = '' - ${pkgs.earlyoom}/bin/earlyoom \ - -m ${toString ecfg.freeMemThreshold} \ - -s ${toString ecfg.freeSwapThreshold} \ - ${optionalString ecfg.useKernelOOMKiller "-k"} \ - ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ - ${optionalString ecfg.enableDebugInfo "-d"} \ - ${optionalString ecfg.enableNotifications "-n"} - ''; + ExecStart = concatStringsSep " " ([ + "${pkgs.earlyoom}/bin/earlyoom" + "-m ${toString ecfg.freeMemThreshold}" + "-s ${toString ecfg.freeSwapThreshold}" + ] ++ optional ecfg.ignoreOOMScoreAdjust "-i" + ++ optional ecfg.enableDebugInfo "-d" + ++ optional ecfg.enableNotifications "-n"); }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index d2bbc4fc05..a32b81a916 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -81,6 +81,8 @@ in { }; }; + security.polkit.enable = true; + security.pam.services.cage.text = '' auth required pam_unix.so nullok account required pam_unix.so diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 14cbfb3954..641c9be85d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -7,26 +7,12 @@ let defaultAddress = "localhost:8080"; dbUser = "miniflux"; - dbPassword = "miniflux"; - dbHost = "localhost"; dbName = "miniflux"; - defaultCredentials = pkgs.writeText "miniflux-admin-credentials" '' - ADMIN_USERNAME=admin - ADMIN_PASSWORD=password - ''; - pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} - db_exists() { - [ "$(${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] - } - if ! db_exists "${dbName}"; then - ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" - ${pgbin}/createdb --owner "${dbUser}" "${dbName}" - ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" - fi + ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; in @@ -54,11 +40,10 @@ in }; adminCredentialsFile = mkOption { - type = types.nullOr types.path; - default = null; + type = types.path; description = '' - File containing the ADMIN_USERNAME, default is "admin", and - ADMIN_PASSWORD (length >= 6), default is "password"; in the format of + File containing the ADMIN_USERNAME and + ADMIN_PASSWORD (length >= 6) in the format of an EnvironmentFile=, as described by systemd.exec(5). ''; example = "/etc/nixos/miniflux-admin-credentials"; @@ -70,16 +55,24 @@ in services.miniflux.config = { LISTEN_ADDR = mkDefault defaultAddress; - DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; + DATABASE_URL = "user=${dbUser} host=/run/postgresql dbname=${dbName}"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; }; - services.postgresql.enable = true; + services.postgresql = { + enable = true; + ensureUsers = [ { + name = dbUser; + ensurePermissions = { + "DATABASE ${dbName}" = "ALL PRIVILEGES"; + }; + } ]; + ensureDatabases = [ dbName ]; + }; systemd.services.miniflux-dbsetup = { description = "Miniflux database setup"; - wantedBy = [ "multi-user.target" ]; requires = [ "postgresql.service" ]; after = [ "network.target" "postgresql.service" ]; serviceConfig = { @@ -92,17 +85,16 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; + requires = [ "miniflux-dbsetup.service" ]; after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { ExecStart = "${pkgs.miniflux}/bin/miniflux"; + User = dbUser; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if cfg.adminCredentialsFile == null - then defaultCredentials - else cfg.adminCredentialsFile; + EnvironmentFile = cfg.adminCredentialsFile; # Hardening CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "" ]; @@ -119,7 +111,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix index a654280182..e195e6e6e8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix @@ -320,6 +320,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; streaming_playlists = lib.mkDefault "/var/lib/peertube/storage/streaming-playlists/"; @@ -333,6 +334,15 @@ in { plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/"; client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/"; }; + import = { + videos = { + http = { + youtube_dl_release = { + python_path = "${pkgs.python3}/bin/python"; + }; + }; + }; + }; } (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; }) ]; @@ -380,7 +390,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn youtube-dl ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; script = '' #!/bin/sh diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 6876dbf39d..7daf0f158b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -988,5 +988,17 @@ in nginx.gid = config.ids.gids.nginx; }; + services.logrotate.paths.nginx = mapAttrs (_: mkDefault) { + path = "/var/log/nginx/*.log"; + frequency = "weekly"; + keep = 26; + extraConfig = '' + compress + delaycompress + postrotate + [ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid` + endscript + ''; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 84b75c83ae..27dfed3cc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -267,6 +267,8 @@ in # Enable the accounts daemon to find lightdm's dbus interface environment.systemPackages = [ lightdm ]; + security.polkit.enable = true; + security.pam.services.lightdm.text = '' auth substack login account include login diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index ec6d86d59b..0c50d82b23 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -620,9 +620,6 @@ in in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver)); assertions = [ - { assertion = config.security.polkit.enable; - message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; - } (let primaryHeads = filter (x: x.primary) cfg.xrandrHeads; in { assertion = length primaryHeads < 2; message = "Only one head is allowed to be primary in " diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index a8fe14c58f..3a5ffe822e 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -307,6 +307,7 @@ sub handleModifiedUnit { # seem to get applied on daemon-reload. } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. + # FIXME: only reload when Options= changed, restart otherwise $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); } elsif ($unit =~ /\.socket$/) { @@ -339,7 +340,7 @@ sub handleModifiedUnit { # If this unit is socket-activated, then stop the # socket unit(s) as well, and restart the # socket(s) instead of the service. - my $socketActivated = 0; + my $socket_activated = 0; if ($unit =~ /\.service$/) { my @sockets = split(/ /, join(" ", @{$unitInfo{Service}{Sockets} // []})); if (scalar @sockets == 0) { @@ -347,13 +348,15 @@ sub handleModifiedUnit { } foreach my $socket (@sockets) { if (defined $activePrev->{$socket}) { + # We can now be sure this is a socket-activate unit + $unitsToStop->{$socket} = 1; # Only restart sockets that actually # exist in new configuration: if (-e "$out/etc/systemd/system/$socket") { $unitsToStart->{$socket} = 1; recordUnit($startListFile, $socket); - $socketActivated = 1; + $socket_activated = 1; } # Remove from units to reload so we don't restart and reload if ($unitsToReload->{$unit}) { @@ -368,7 +371,7 @@ sub handleModifiedUnit { # that this unit needs to be started below. # We write this to a file to ensure that the # service gets restarted if we're interrupted. - if (!$socketActivated) { + if (!$socket_activated) { $unitsToStart->{$unit} = 1; recordUnit($startListFile, $unit); } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix index 7426d14889..27f78835ad 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix @@ -72,6 +72,8 @@ with lib; ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; + environment.systemPackages = [ pkgs.kmod ]; system.activationScripts.modprobe = stringAfter ["specialfs"] diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix index 02d2660add..0c6822319a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd-nspawn.nix @@ -120,14 +120,6 @@ in { }) { systemd.targets.multi-user.wants = [ "machines.target" ]; - - # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 - # Once systemd fixes this upstream, we can re-enable -U - systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ - "" # deliberately empty. signals systemd to override the ExecStart - # Only difference between upstream is that we do not pass the -U flag - "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" - ]; } ]; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 1f2dd61869..4019af63ad 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -1217,6 +1217,25 @@ in boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); boot.kernelParams = optional (!cfg.enableUnifiedCgroupHierarchy) "systemd.unified_cgroup_hierarchy=0"; + + services.logrotate.paths = { + "/var/log/btmp" = mapAttrs (_: mkDefault) { + frequency = "monthly"; + keep = 1; + extraConfig = '' + create 0660 root ${config.users.groups.utmp.name} + minsize 1M + ''; + }; + "/var/log/wtmp" = mapAttrs (_: mkDefault) { + frequency = "monthly"; + keep = 1; + extraConfig = '' + create 0664 root ${config.users.groups.utmp.name} + minsize 1M + ''; + }; + }; }; # FIXME: Remove these eventually. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index bd7077ff7e..9a56b69501 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -37,8 +37,13 @@ in { assertion = cfg.efi -> cfg.hvm; message = "EC2 instances using EFI must be HVM instances."; } + { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15"; + message = "ENA driver fails to build with kernel >= 5.15"; + } ]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10; + boot.growPartition = cfg.hvm; fileSystems."/" = mkIf (!cfg.zfs.enable) { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 133cd4c0e9..25104bb476 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -15,7 +15,8 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) + # When no user-data is provided, the OpenStack metadata server doesn't expose the user-data route. + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data || rm -f "$metaDir/user-data") wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-lxc.nix b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-lxc.nix new file mode 100644 index 0000000000..3913b474af --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-lxc.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + options.proxmoxLXC = { + privileged = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable privileged mounts + ''; + }; + manageNetwork = mkOption { + type = types.bool; + default = false; + description = '' + Whether to manage network interfaces through nix options + When false, systemd-networkd is enabled to accept network + configuration from proxmox. + ''; + }; + }; + + config = + let + cfg = config.proxmoxLXC; + in + { + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { + storeContents = [{ + object = config.system.build.toplevel; + symlink = "none"; + }]; + + contents = [{ + source = config.system.build.toplevel + "/init"; + target = "/sbin/init"; + }]; + + extraCommands = "mkdir -p root etc/systemd/network"; + }; + + boot = { + isContainer = true; + loader.initScript.enable = true; + }; + + networking = mkIf (!cfg.manageNetwork) { + useDHCP = false; + useHostResolvConf = false; + useNetworkd = true; + }; + + services.openssh = { + enable = mkDefault true; + startWhenNeeded = mkDefault true; + }; + + systemd.mounts = mkIf (!cfg.privileged) + [{ where = "/sys/kernel/debug"; enable = false; }]; + + }; +} diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index ee3f3d1917..fd8a39cfb9 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -98,7 +98,6 @@ in rec { (onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.mutableUsers") - (onFullSupported "nixos.tests.nano") (onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.standalone") @@ -130,7 +129,8 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.virtual") (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") - (onFullSupported "nixos.tests.nfs3.simple") + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #(onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onFullSupported "nixos.tests.openssh") (onFullSupported "nixos.tests.pantheon") diff --git a/third_party/nixpkgs/nixos/release-small.nix b/third_party/nixpkgs/nixos/release-small.nix index 996db54c9a..1d51b4e7f2 100644 --- a/third_party/nixpkgs/nixos/release-small.nix +++ b/third_party/nixpkgs/nixos/release-small.nix @@ -38,7 +38,8 @@ in rec { login misc nat - nfs3 + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #nfs3 openssh php predictable-interface-names @@ -107,7 +108,8 @@ in rec { "nixos.tests.nat.firewall-conntrack.x86_64-linux" "nixos.tests.nat.firewall.x86_64-linux" "nixos.tests.nat.standalone.x86_64-linux" - "nixos.tests.nfs3.simple.x86_64-linux" + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #"nixos.tests.nfs3.simple.x86_64-linux" "nixos.tests.openssh.x86_64-linux" "nixos.tests.php.fpm.x86_64-linux" "nixos.tests.php.pcre.x86_64-linux" diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index a0beaf98de..342e8f461b 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -189,9 +189,9 @@ in grocy = handleTest ./grocy.nix {}; grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; - hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {}; - hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; - hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; + hadoop.all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hadoop.nix {}; + hadoop.hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hdfs.nix {}; + hadoop.yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/yarn.nix {}; haka = handleTest ./haka.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; @@ -270,6 +270,7 @@ in litestream = handleTest ./litestream.nix {}; locate = handleTest ./locate.nix {}; login = handleTest ./login.nix {}; + logrotate = handleTest ./logrotate.nix {}; loki = handleTest ./loki.nix {}; lxd = handleTest ./lxd.nix {}; lxd-image = handleTest ./lxd-image.nix {}; @@ -321,7 +322,6 @@ in mysql-replication = handleTest ./mysql/mysql-replication.nix {}; n8n = handleTest ./n8n.nix {}; nagios = handleTest ./nagios.nix {}; - nano = handleTest ./nano.nix {}; nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; @@ -347,6 +347,7 @@ in nginx = handleTest ./nginx.nix {}; nginx-auth = handleTest ./nginx-auth.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; + nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; @@ -392,6 +393,8 @@ in pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; + pgadmin4 = handleTest ./pgadmin4.nix {}; + pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; @@ -499,6 +502,7 @@ in systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; + systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; systemd-networkd-dhcpserver-static-leases = handleTest ./systemd-networkd-dhcpserver-static-leases.nix {}; @@ -550,6 +554,7 @@ in vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; vscodium = discoverTests (import ./vscodium.nix); + vsftpd = handleTest ./vsftpd.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; @@ -568,6 +573,7 @@ in xxh = handleTest ./xxh.nix {}; yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; + zammad = handleTest ./zammad.nix {}; zfs = handleTest ./zfs.nix {}; zigbee2mqtt = handleTest ./zigbee2mqtt.nix {}; zoneminder = handleTest ./zoneminder.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/bird.nix b/third_party/nixpkgs/nixos/tests/bird.nix index 50d397be14..822a7caea9 100644 --- a/third_party/nixpkgs/nixos/tests/bird.nix +++ b/third_party/nixpkgs/nixos/tests/bird.nix @@ -9,7 +9,7 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) optionalString; - hostShared = hostId: { pkgs, ... }: { + makeBird2Host = hostId: { pkgs, ... }: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ jq ]; @@ -24,105 +24,6 @@ let name = "eth1"; networkConfig.Address = "10.0.0.${hostId}/24"; }; - }; - - birdTest = v4: - let variant = "bird${optionalString (!v4) "6"}"; in - makeTest { - name = variant; - - nodes.host1 = makeBirdHost variant "1"; - nodes.host2 = makeBirdHost variant "2"; - - testScript = makeTestScript variant v4 (!v4); - }; - - bird2Test = makeTest { - name = "bird2"; - - nodes.host1 = makeBird2Host "1"; - nodes.host2 = makeBird2Host "2"; - - testScript = makeTestScript "bird2" true true; - }; - - makeTestScript = variant: v4: v6: '' - start_all() - - host1.wait_for_unit("${variant}.service") - host2.wait_for_unit("${variant}.service") - - ${optionalString v4 '' - with subtest("Waiting for advertised IPv4 routes"): - host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") - host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") - ''} - ${optionalString v6 '' - with subtest("Waiting for advertised IPv6 routes"): - host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") - host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") - ''} - - with subtest("Check fake routes in preCheckConfig do not exists"): - ${optionalString v4 ''host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - ${optionalString v4 ''host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - - ${optionalString v6 ''host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ${optionalString v6 ''host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ''; - - makeBirdHost = variant: hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; - - services.${variant} = { - enable = true; - - config = '' - log syslog all; - - debug protocols all; - - router id 10.0.0.${hostId}; - - protocol device { - } - - protocol kernel { - import none; - export all; - } - - protocol static { - include "static.conf"; - } - - protocol ospf { - export all; - area 0 { - interface "eth1" { - hello 5; - wait 5; - }; - }; - } - ''; - - preCheckConfig = - let - route = { bird = "1.2.3.4/32"; bird6 = "fd00::/128"; }.${variant}; - in - ''echo "route ${route} blackhole;" > static.conf''; - }; - - systemd.tmpfiles.rules = - let - route = { bird = "10.10.0.${hostId}/32"; bird6 = "fdff::${hostId}/128"; }.${variant}; - in - [ "f /etc/bird/static.conf - - - - route ${route} blackhole;" ]; - }; - - makeBird2Host = hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; services.bird2 = { enable = true; @@ -198,8 +99,31 @@ let ]; }; in -{ - bird = birdTest true; - bird6 = birdTest false; - bird2 = bird2Test; +makeTest { + name = "bird2"; + + nodes.host1 = makeBird2Host "1"; + nodes.host2 = makeBird2Host "2"; + + testScript = '' + start_all() + + host1.wait_for_unit("bird2.service") + host2.wait_for_unit("bird2.service") + host1.succeed("systemctl reload bird2.service") + + with subtest("Waiting for advertised IPv4 routes"): + host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") + host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") + with subtest("Waiting for advertised IPv6 routes"): + host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") + host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") + + with subtest("Check fake routes in preCheckConfig do not exists"): + host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + + host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + ''; } diff --git a/third_party/nixpkgs/nixos/tests/cntr.nix b/third_party/nixpkgs/nixos/tests/cntr.nix index 6684707562..e4e13545b8 100644 --- a/third_party/nixpkgs/nixos/tests/cntr.nix +++ b/third_party/nixpkgs/nixos/tests/cntr.nix @@ -28,10 +28,16 @@ let testScript = '' start_all() ${backend}.wait_for_unit("${backend}-nginx.service") - result = ${backend}.wait_until_succeeds( - "cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'" + ${backend}.wait_for_open_port(8181) + # For some reason, the cntr command hangs when run without the &. + # As such, we have to do some messy things to ensure we check the exitcode and output in a race-condition-safe manner + ${backend}.execute( + "(cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello' > /tmp/result; echo $? > /tmp/exitcode; touch /tmp/done) &" ) - assert "Hello" in result + + ${backend}.wait_for_file("/tmp/done") + assert "0" == ${backend}.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" + assert "Hello" in ${backend}.succeed("cat /tmp/result"), "no greeting in output" ''; }; @@ -54,7 +60,13 @@ let testScript = '' machine.start() machine.wait_for_unit("container@test.service") - machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'") + # I haven't observed the same hanging behaviour in this version as in the OCI version which necessetates this messy invocation, but it's probably better to be safe than sorry and use it here as well + machine.execute( + "(cntr attach test sh -- -c 'ping -c5 172.16.0.1'; echo $? > /tmp/exitcode; touch /tmp/done) &" + ) + + machine.wait_for_file("/tmp/done") + assert "0" == machine.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" ''; }; in { diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix index 31f8a4bcc1..10f9cb05c9 100644 --- a/third_party/nixpkgs/nixos/tests/home-assistant.nix +++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix @@ -2,8 +2,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let configDir = "/var/lib/foobar"; - mqttUsername = "homeassistant"; - mqttPassword = "secret"; in { name = "home-assistant"; meta.maintainers = lib.teams.home-assistant.members; @@ -11,18 +9,6 @@ in { nodes.hass = { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto ]; - services.mosquitto = { - enable = true; - listeners = [ { - users = { - "${mqttUsername}" = { - acl = [ "readwrite #" ]; - password = mqttPassword; - }; - }; - } ]; - }; - services.postgresql = { enable = true; ensureDatabases = [ "hass" ]; @@ -76,23 +62,6 @@ in { # https://www.home-assistant.io/integrations/frontend/ frontend = {}; - # configure an mqtt broker connection - # https://www.home-assistant.io/integrations/mqtt - mqtt = { - broker = "127.0.0.1"; - username = mqttUsername; - password = mqttPassword; - }; - - # create a mqtt sensor that syncs state with its mqtt topic - # https://www.home-assistant.io/integrations/sensor.mqtt/ - binary_sensor = [ { - platform = "mqtt"; - state_topic = "home-assistant/test"; - payload_on = "let_there_be_light"; - payload_off = "off"; - } ]; - # set up a wake-on-lan switch to test capset capability required # for the ping suid wrapper # https://www.home-assistant.io/integrations/wake_on_lan/ @@ -109,11 +78,9 @@ in { listen_port = 80; }; - # show mqtt interaction in the log # https://www.home-assistant.io/integrations/logger/ logger = { default = "info"; - logs."homeassistant.components.mqtt" = "debug"; }; }; @@ -167,12 +134,6 @@ in { hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") - with subtest("Toggle a binary sensor using MQTT"): - hass.wait_for_open_port(1883) - hass.succeed( - "mosquitto_pub -V mqttv5 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light" - ) - with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): hass.wait_for_open_port(80) hass.succeed("curl --fail http://localhost:80/description.xml") @@ -188,10 +149,6 @@ in { with subtest("Check that no errors were logged"): assert "ERROR" not in output_log - # example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light' - with subtest("Check we received the mosquitto message"): - assert "let_there_be_light" in output_log - with subtest("Check systemd unit hardening"): hass.log(hass.succeed("systemctl cat home-assistant.service")) hass.log(hass.succeed("systemd-analyze security home-assistant.service")) diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/base.nix b/third_party/nixpkgs/nixos/tests/kubernetes/base.nix index f0c72084be..d4410beb93 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/base.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/base.nix @@ -18,7 +18,7 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; - kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" ''; @@ -48,7 +48,7 @@ let }; }; programs.bash.enableCompletion = true; - environment.systemPackages = [ kubectl ]; + environment.systemPackages = [ wrapKubectl ]; services.flannel.iface = "eth1"; services.kubernetes = { proxy.hostname = "${masterName}.${domain}"; diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix b/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix index ca73562256..9e73fbbd32 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix @@ -76,7 +76,7 @@ let }]; }); - kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } '' + copyKubectl = pkgs.runCommand "copy-kubectl" { } '' mkdir -p $out/bin cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl ''; @@ -84,7 +84,7 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ kubectl pkgs.busybox kubectlPod2 ]; + contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; config.Entrypoint = ["/bin/sh"]; }; diff --git a/third_party/nixpkgs/nixos/tests/logrotate.nix b/third_party/nixpkgs/nixos/tests/logrotate.nix new file mode 100644 index 0000000000..38da8d5352 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/logrotate.nix @@ -0,0 +1,37 @@ +# Test logrotate service works and is enabled by default + +import ./make-test-python.nix ({ pkgs, ...} : rec { + name = "logrotate"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; + + # default machine + machine = { ... }: { + }; + + testScript = + '' + with subtest("whether logrotate works"): + machine.succeed( + # we must rotate once first to create logrotate stamp + "systemctl start logrotate.service") + # we need to wait for console text once here to + # clear console buffer up to this point for next wait + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + + machine.succeed( + # wtmp is present in default config. + "rm -f /var/log/wtmp*", + # we need to give it at least 1MB + "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", + + # move into the future and check rotation. + "date -s 'now + 1 month + 1 day'") + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + machine.succeed( + # check rotate worked + "[ -e /var/log/wtmp.1 ]", + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix index e1da410af0..d1c561f95d 100644 --- a/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix +++ b/third_party/nixpkgs/nixos/tests/matrix-appservice-irc.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: let - homeserverUrl = "http://homeserver:8448"; + homeserverUrl = "http://homeserver:8008"; in { name = "matrix-appservice-irc"; @@ -14,28 +14,32 @@ import ./make-test-python.nix ({ pkgs, ... }: specialisation.running.configuration = { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - app_service_config_files = [ "/registration.yml" ]; + settings = { + database.name = "sqlite3"; + app_service_config_files = [ "/registration.yml" ]; - enable_registration = true; + enable_registration = true; - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" ]; } - { "compress" = false; "names" = [ "federation" ]; } + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8008; + resources = [ { + "compress" = true; + "names" = [ "client" ]; + } { + "compress" = false; + "names" = [ "federation" ]; + } ]; + tls = false; + type = "http"; + } ]; + }; }; - networking.firewall.allowedTCPPorts = [ 8448 ]; + networking.firewall.allowedTCPPorts = [ 8008 ]; }; }; @@ -209,7 +213,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ) homeserver.wait_for_unit("matrix-synapse.service") - homeserver.wait_for_open_port(8448) + homeserver.wait_for_open_port(8008) with subtest("ensure messages can be exchanged"): client.succeed("do_test ${homeserverUrl} >&2") diff --git a/third_party/nixpkgs/nixos/tests/matrix-synapse.nix b/third_party/nixpkgs/nixos/tests/matrix-synapse.nix index 21e8c24e47..1ff1e47b28 100644 --- a/third_party/nixpkgs/nixos/tests/matrix-synapse.nix +++ b/third_party/nixpkgs/nixos/tests/matrix-synapse.nix @@ -33,6 +33,29 @@ import ./make-test-python.nix ({ pkgs, ... } : let testUser = "alice"; testPassword = "alicealice"; testEmail = "alice@example.com"; + + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + in { name = "matrix-synapse"; @@ -48,22 +71,24 @@ in { { services.matrix-synapse = { enable = true; - database_type = "psycopg2"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - database_args = { - password = "synapse"; + settings = { + inherit listeners; + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + registration_shared_secret = registrationSharedSecret; + public_baseurl = "https://example.com"; + email = { + smtp_host = mailerDomain; + smtp_port = 25; + require_transport_security = true; + notif_from = "matrix "; + app_name = "Matrix"; + }; }; - registration_shared_secret = registrationSharedSecret; - public_baseurl = "https://example.com"; - extraConfig = '' - email: - smtp_host: "${mailerDomain}" - smtp_port: 25 - require_transport_security: true - notif_from: "matrix " - app_name: "Matrix" - ''; }; services.postgresql = { enable = true; @@ -165,9 +190,12 @@ in { serversqlite = args: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + inherit listeners; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix b/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix index bb55f6f544..54094ab9d6 100644 --- a/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix +++ b/third_party/nixpkgs/nixos/tests/matrix/mjolnir.nix @@ -38,26 +38,31 @@ import ../make-test-python.nix ( homeserver = { pkgs, ... }: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - enable_registration = true; - registration_shared_secret = "supersecret-registration"; + settings = { + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + enable_registration = true; + registration_shared_secret = "supersecret-registration"; - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" "webclient" ]; } - { "compress" = false; "names" = [ "federation" ]; } + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8448; + resources = [ { + compress = true; + names = [ "client" ]; + } { + compress = false; + names = [ "federation" ]; + } ]; + tls = false; + type = "http"; + x_forwarded = false; + } ]; + }; }; networking.firewall.allowedTCPPorts = [ 8448 ]; diff --git a/third_party/nixpkgs/nixos/tests/matrix/pantalaimon.nix b/third_party/nixpkgs/nixos/tests/matrix/pantalaimon.nix index fcb9904b21..1a9894dd21 100644 --- a/third_party/nixpkgs/nixos/tests/matrix/pantalaimon.nix +++ b/third_party/nixpkgs/nixos/tests/matrix/pantalaimon.nix @@ -47,9 +47,32 @@ import ../make-test-python.nix ( services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/miniflux.nix b/third_party/nixpkgs/nixos/tests/miniflux.nix index 1015550fa8..d905aea048 100644 --- a/third_party/nixpkgs/nixos/tests/miniflux.nix +++ b/third_party/nixpkgs/nixos/tests/miniflux.nix @@ -7,6 +7,15 @@ let defaultPort = 8080; defaultUsername = "admin"; defaultPassword = "password"; + adminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${defaultUsername} + ADMIN_PASSWORD=${defaultPassword} + ''; + customAdminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${username} + ADMIN_PASSWORD=${password} + ''; + in with lib; { @@ -17,13 +26,19 @@ with lib; default = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; }; withoutSudo = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; security.sudo.enable = false; }; @@ -36,10 +51,7 @@ with lib; CLEANUP_FREQUENCY = "48"; LISTEN_ADDR = "localhost:${toString port}"; }; - adminCredentialsFile = pkgs.writeText "admin-credentials" '' - ADMIN_USERNAME=${username} - ADMIN_PASSWORD=${password} - ''; + adminCredentialsFile = customAdminCredentialsFile; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/nano.nix b/third_party/nixpkgs/nixos/tests/nano.nix deleted file mode 100644 index 6585a6842e..0000000000 --- a/third_party/nixpkgs/nixos/tests/nano.nix +++ /dev/null @@ -1,44 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "nano"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { lib, ... }: { - environment.systemPackages = [ pkgs.nano ]; - }; - - testScript = { ... }: '' - start_all() - - with subtest("Create user and log in"): - machine.wait_for_unit("multi-user.target") - machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - machine.succeed("useradd -m alice") - machine.succeed("(echo foobar; echo foobar) | passwd alice") - machine.wait_until_tty_matches(1, "login: ") - machine.send_chars("alice\n") - machine.wait_until_tty_matches(1, "login: alice") - machine.wait_until_succeeds("pgrep login") - machine.wait_until_tty_matches(1, "Password: ") - machine.send_chars("foobar\n") - machine.wait_until_succeeds("pgrep -u alice bash") - machine.screenshot("prompt") - - with subtest("Use nano"): - machine.send_chars("nano /tmp/foo") - machine.send_key("ret") - machine.sleep(2) - machine.send_chars("42") - machine.sleep(1) - machine.send_key("ctrl-x") - machine.sleep(1) - machine.send_key("y") - machine.sleep(1) - machine.screenshot("nano") - machine.sleep(1) - machine.send_key("ret") - machine.wait_for_file("/tmp/foo") - assert "42" in machine.succeed("cat /tmp/foo") - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 2510937b5d..8c9df19f2d 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -246,13 +246,13 @@ let networking = { useNetworkd = networkd; useDHCP = false; - bonds.bond = { + bonds.bond0 = { interfaces = [ "eth1" "eth2" ]; - driverOptions.mode = "balance-rr"; + driverOptions.mode = "802.3ad"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; - interfaces.bond.ipv4.addresses = mkOverride 0 + interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; }; @@ -274,6 +274,10 @@ let client2.wait_until_succeeds("ping -c 2 192.168.1.1") client2.wait_until_succeeds("ping -c 2 192.168.1.2") + + with subtest("Verify bonding mode"): + for client in client1, client2: + client.succeed('grep -q "Bonding Mode: IEEE 802.3ad Dynamic link aggregation" /proc/net/bonding/bond0') ''; }; bridge = let @@ -864,7 +868,7 @@ let print(client.succeed("ip l add name foo type dummy")) print(client.succeed("stat /etc/systemd/network/50-foo.link")) client.succeed("udevadm settle") - assert "mtu 1442" in client.succeed("ip l show dummy0") + assert "mtu 1442" in client.succeed("ip l show dev foo") ''; }; wlanInterface = let diff --git a/third_party/nixpkgs/nixos/tests/nginx-modsecurity.nix b/third_party/nixpkgs/nixos/tests/nginx-modsecurity.nix new file mode 100644 index 0000000000..8c53c0196d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nginx-modsecurity.nix @@ -0,0 +1,39 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "nginx-modsecurity"; + + machine = { config, lib, pkgs, ... }: { + services.nginx = { + enable = true; + additionalModules = [ pkgs.nginxModules.modsecurity-nginx ]; + virtualHosts.localhost = + let modsecurity_conf = pkgs.writeText "modsecurity.conf" '' + SecRuleEngine On + SecDefaultAction "phase:1,log,auditlog,deny,status:403" + SecDefaultAction "phase:2,log,auditlog,deny,status:403" + SecRule REQUEST_METHOD "HEAD" "id:100, phase:1, block" + SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block" + ''; + testroot = pkgs.runCommand "testroot" {} '' + mkdir -p $out + echo "Hello World!" > $out/index.html + echo "s3cret" > $out/secret.html + ''; + in { + root = testroot; + extraConfig = '' + modsecurity on; + modsecurity_rules_file ${modsecurity_conf}; + ''; + }; + }; + }; + testScript = '' + machine.wait_for_unit("nginx") + + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/") + assert "Hello World!" in response + + machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/") + machine.fail("curl -fvvv -s http://127.0.0.1/secret.html") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nixops/default.nix b/third_party/nixpkgs/nixos/tests/nixops/default.nix index b25fc95f4b..f0834c51f0 100644 --- a/third_party/nixpkgs/nixos/tests/nixops/default.nix +++ b/third_party/nixpkgs/nixos/tests/nixops/default.nix @@ -9,7 +9,7 @@ let # - Alternatively, blocked on a NixOps 2 release # https://github.com/NixOS/nixops/issues/1242 # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; - unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable; }; # inherit testsForPackage; }; diff --git a/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix b/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix new file mode 100644 index 0000000000..442570c530 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/pgadmin4-standalone.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + # This is seperate from pgadmin4 since we don't want both running at once + + { + name = "pgadmin4-standalone"; + meta.maintainers = with lib.maintainers; [ mkg20001 ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + curl + ]; + + services.postgresql = { + enable = true; + + authentication = '' + host all all localhost trust + ''; + + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + services.pgadmin = { + enable = true; + initialEmail = "bruh@localhost.de"; + initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + machine.wait_for_unit("pgadmin") + + machine.wait_until_succeeds("curl -s localhost:5050") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/pgadmin4.nix b/third_party/nixpkgs/nixos/tests/pgadmin4.nix new file mode 100644 index 0000000000..658315d3ac --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/pgadmin4.nix @@ -0,0 +1,142 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + let + pgadmin4SrcDir = "/pgadmin"; + pgadmin4Dir = "/var/lib/pgadmin"; + pgadmin4LogDir = "/var/log/pgadmin"; + + python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [ + selenium + testtools + testscenarios + flask + flask-babelex + flask-babel + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + ]); + in + { + name = "pgadmin4"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + environment.systemPackages = with pkgs; [ + pgadmin4 + postgresql + python-with-needed-packages + chromedriver + chromium + ]; + services.postgresql = { + enable = true; + authentication = '' + host all all localhost trust + ''; + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + + # pgadmin4 needs its data and log directories + machine.succeed( + "mkdir -p ${pgadmin4Dir} \ + && mkdir -p ${pgadmin4LogDir} \ + && mkdir -p ${pgadmin4SrcDir}" + ) + + machine.succeed( + "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}" + ) + + machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md") + + # set paths and config for tests + machine.succeed( + "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ + && cp -v web/regression/test_config.json.in web/regression/test_config.json \ + && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \ + && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \ + && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json" + ) + + # adapt chrome config to run within a sandbox without GUI + # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913 + # add chrome binary path. use spaces to satisfy python indention (tabs throw an error) + # this works for selenium 3 (currently used), but will need to be updated + # to work with "from selenium.webdriver.chrome.service import Service" in selenium 4 + machine.succeed( + "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ + && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \ + && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \ + && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \ + && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \ + && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py" + ) + + # don't bother to test LDAP authentification + with subtest("run browser test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \ + browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login' + ) + + # fontconfig is necessary for chromium to run + # https://github.com/NixOS/nixpkgs/issues/136207 + with subtest("run feature test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests' + ) + + with subtest("run resql test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql' + ) + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/podman/default.nix b/third_party/nixpkgs/nixos/tests/podman/default.nix index b52a7f060a..67c7823c5a 100644 --- a/third_party/nixpkgs/nixos/tests/podman/default.nix +++ b/third_party/nixpkgs/nixos/tests/podman/default.nix @@ -126,7 +126,7 @@ import ../make-test-python.nix ( podman.succeed("docker network create default") podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") podman.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) podman.succeed("docker ps | grep sleeping") podman.succeed("podman ps | grep sleeping") diff --git a/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix b/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix index c0bc47cc40..268a55701c 100644 --- a/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix +++ b/third_party/nixpkgs/nixos/tests/podman/tls-ghostunnel.nix @@ -129,7 +129,7 @@ import ../make-test-python.nix ( podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") client.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) client.succeed("docker ps | grep sleeping") podman.succeed("docker ps | grep sleeping") diff --git a/third_party/nixpkgs/nixos/tests/shiori.nix b/third_party/nixpkgs/nixos/tests/shiori.nix index 418bee43c9..6c59c39400 100644 --- a/third_party/nixpkgs/nixos/tests/shiori.nix +++ b/third_party/nixpkgs/nixos/tests/shiori.nix @@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: authJSON = pkgs.writeText "auth.json" (builtins.toJSON { username = "shiori"; password = "gopher"; - remember = 1; # hour owner = true; }); diff --git a/third_party/nixpkgs/nixos/tests/switch-test.nix b/third_party/nixpkgs/nixos/tests/switch-test.nix index 4f297b6521..78eb71f0a2 100644 --- a/third_party/nixpkgs/nixos/tests/switch-test.nix +++ b/third_party/nixpkgs/nixos/tests/switch-test.nix @@ -1,6 +1,46 @@ # Test configuration switching. -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : let + + # Simple service that can either be socket-activated or that will + # listen on port 1234 if not socket-activated. + # A connection to the socket causes 'hello' to be written to the client. + socketTest = pkgs.writeScript "socket-test.py" /* python */ '' + #!${pkgs.python3}/bin/python3 + + from socketserver import TCPServer, StreamRequestHandler + import socket + import os + + + class Handler(StreamRequestHandler): + def handle(self): + self.wfile.write("hello".encode("utf-8")) + + + class Server(TCPServer): + def __init__(self, server_address, handler_cls): + listenFds = os.getenv('LISTEN_FDS') + if listenFds is None or int(listenFds) < 1: + print(f'Binding to {server_address}') + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=True) + else: + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=False) + # Override socket + print(f'Got activated by {os.getenv("LISTEN_FDNAMES")} ' + f'with {listenFds} FDs') + self.socket = socket.fromfd(3, self.address_family, + self.socket_type) + + + if __name__ == "__main__": + server = Server(("localhost", 1234), Handler) + server.serve_forever() + ''; + +in { name = "switch-test"; meta = with pkgs.lib.maintainers; { maintainers = [ gleber das_j ]; @@ -8,6 +48,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes = { machine = { pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; specialisation = rec { @@ -231,6 +272,40 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.reload-triggers-and-restart.serviceConfig.X-Modified = "test"; }; + simple-socket.configuration = { + systemd.services.socket-activated = { + description = "A socket-activated service"; + stopIfChanged = lib.mkDefault false; + serviceConfig = { + ExecStart = socketTest; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.sockets.socket-activated = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "/run/test.sock" ]; + socketConfig.SocketMode = lib.mkDefault "0777"; + }; + }; + + simple-socket-service-modified.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.serviceConfig.X-Test = "test"; + }; + + simple-socket-stop-if-changed.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.stopIfChanged = true; + }; + + simple-socket-stop-if-changed-and-reloadtrigger.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated = { + stopIfChanged = true; + reloadTriggers = [ "test" ]; + }; + }; + mount.configuration = { systemd.mounts = [ { @@ -283,6 +358,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test-watch = { serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified"; }; }; @@ -377,7 +453,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Start a simple service out = switch_to_specialisation("${machine}", "simpleService") @@ -387,7 +462,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") - assert_lacks(out, "as well:") # Not changing anything doesn't do anything out = switch_to_specialisation("${machine}", "simpleService") @@ -397,7 +471,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Restart the simple service out = switch_to_specialisation("${machine}", "simpleServiceModified") @@ -407,7 +480,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_contains(out, "\nstarting the following units: test.service\n") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Restart the service with stopIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -417,7 +489,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Reload the service with reloadIfChanged=true out = switch_to_specialisation("${machine}", "simpleServiceReload") @@ -427,7 +498,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Nothing happens when restartIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNorestart") @@ -437,7 +507,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Dry mode shows different messages out = switch_to_specialisation("${machine}", "simpleService", action="dry-activate") @@ -447,7 +516,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") # Ensure \ works in unit names @@ -458,7 +526,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") - assert_lacks(out, "as well:") out = switch_to_specialisation("${machine}", "unitWithBackslashModified") assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") @@ -467,7 +534,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") with subtest("failing units"): # Let the simple service fail @@ -481,7 +547,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "the following new units were started:") assert_contains(out, "warning: the following units failed: test.service\n") assert_contains(out, "Main PID:") # output of systemctl - assert_lacks(out, "as well:") # A unit that gets into autorestart without failing is not treated as failed out = switch_to_specialisation("${machine}", "autorestartService") @@ -491,7 +556,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: autorestart.service\n") - assert_lacks(out, "as well:") machine.systemctl('stop autorestart.service') # cancel the 20y timer # Switching to the same system should do nothing (especially not treat the unit as failed) @@ -502,7 +566,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: autorestart.service\n") - assert_lacks(out, "as well:") machine.systemctl('stop autorestart.service') # cancel the 20y timer # If systemd thinks the unit has failed and is in autorestart, we should show it as failed @@ -515,7 +578,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "the following new units were started:") assert_contains(out, "warning: the following units failed: autorestart.service\n") assert_contains(out, "Main PID:") # output of systemctl - assert_lacks(out, "as well:") with subtest("unit file parser"): # Switch to a well-known state @@ -529,7 +591,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Rename it out = switch_to_specialisation("${machine}", "simpleServiceWithExtraSectionOtherName") @@ -539,7 +600,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove it out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -549,7 +609,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # [Install] section is ignored out = switch_to_specialisation("${machine}", "simpleServiceWithInstallSection") @@ -559,7 +618,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Add a key out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKey") @@ -569,7 +627,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Change its value out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherValue") @@ -579,7 +636,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Rename it out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherName") @@ -589,7 +645,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove it out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -599,7 +654,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Add a reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTrigger") @@ -609,7 +663,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Modify the reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModified") @@ -619,7 +672,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Modify the reload trigger and something else out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedAndSomethingElse") @@ -629,7 +681,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Remove the reload trigger out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedSomethingElse") @@ -639,7 +690,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") with subtest("restart and reload by activation script"): switch_to_specialisation("${machine}", "simpleServiceNorestart") @@ -649,7 +699,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "reloading the following units:") assert_lacks(out, "restarting the following units:") assert_contains(out, "\nstarting the following units: no-restart-service.service, reload-triggers-and-restart-by-as.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") - assert_lacks(out, "as well:") + assert_contains(out, "the following new units were started: no-restart-service.service, reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") # Switch to the same system where the example services get restarted # and reloaded by the activation script out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") @@ -658,7 +708,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "reloading the following units: reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "as well:") + assert_lacks(out, "the following new units were started:") # Switch to the same system and see if the service gets restarted when it's modified # while the fact that it's supposed to be reloaded by the activation script is ignored. out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script-modified") @@ -667,7 +717,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "reloading the following units: reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "as well:") + assert_lacks(out, "the following new units were started:") # The same, but in dry mode out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate") assert_lacks(out, "would stop the following units:") @@ -675,7 +725,71 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "would reload the following units: reload-triggers.service, simple-reload-service.service\n") assert_contains(out, "would restart the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nwould start the following units:") - assert_lacks(out, "as well:") + + with subtest("socket-activated services"): + # Socket-activated services don't get started, just the socket + machine.fail("[ -S /run/test.sock ]") + out = switch_to_specialisation("${machine}", "simple-socket") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: socket-activated.socket\n") + machine.succeed("[ -S /run/test.sock ]") + + # Changing a non-activated service does nothing + out = switch_to_specialisation("${machine}", "simple-socket-service-modified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # The unit is properly activated when the socket is accessed + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated") # idk how that would happen tbh + + # Changing an activated service with stopIfChanged=false restarts the service + out = switch_to_specialisation("${machine}", "simple-socket") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: socket-activated.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing an activated service with stopIfChanged=true stops the service and + # socket and starts the socket + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed") + assert_contains(out, "stopping the following units: socket-activated.service, socket-activated.socket\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: socket-activated.socket\n") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing a reload trigger of a socket-activated unit only reloads it + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed-and-reloadtrigger") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: socket-activated.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units: socket-activated.socket") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") with subtest("mounts"): switch_to_specialisation("${machine}", "mount") @@ -688,7 +802,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=10240k") @@ -699,11 +812,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "OnCalendar=2014-03-25 02:59:56 UTC") out = switch_to_specialisation("${machine}", "timerModified") assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following units:") assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: test-timer.timer\n") + assert_contains(out, "\nrestarting the following units: test-timer.timer\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("systemctl show test-timer.timer") assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") @@ -715,14 +828,14 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") - assert_contains(out, "the following new units were started: test-watch.path") - assert_lacks(out, "as well:") + assert_contains(out, "the following new units were started: test-watch.path\n") machine.fail("test -f /testpath-modified") # touch the file, unit should be triggered machine.succeed("touch /testpath") machine.wait_until_succeeds("test -f /testpath-modified") machine.succeed("rm /testpath /testpath-modified") + machine.systemctl("stop test-watch.service") switch_to_specialisation("${machine}", "pathModified") machine.succeed("touch /testpath") machine.fail("test -f /testpath-modified") @@ -737,8 +850,21 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("slices"): machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # allow OOMing out = switch_to_specialisation("${machine}", "slice") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.fail("systemctl start testservice.service") + out = switch_to_specialisation("${machine}", "sliceModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.succeed("systemctl start testservice.service") machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing ''; diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix index 8fafb11e1e..3181af309a 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix @@ -17,15 +17,19 @@ import ./make-test-python.nix { exit "''${ret:-1}" ''; - mkTestStep = num: { config ? {}, testScript }: { - systemd.sockets."test${toString num}" = { + mkTestStep = num: { + testScript, + config ? {}, + serviceName ? "test${toString num}", + }: { + systemd.sockets.${serviceName} = { description = "Socket for Test Service ${toString num}"; wantedBy = [ "sockets.target" ]; socketConfig.ListenStream = "/run/test${toString num}.sock"; socketConfig.Accept = true; }; - systemd.services."test${toString num}@" = { + systemd.services."${serviceName}@" = { description = "Confined Test Service ${toString num}"; confinement = (config.confinement or {}) // { enable = true; }; serviceConfig = (config.serviceConfig or {}) // { @@ -135,6 +139,16 @@ import ./make-test-python.nix { machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek') ''; } + { serviceName = "shipped-unitfile"; + config.confinement.mode = "chroot-only"; + testScript = '' + with subtest("check if shipped unit file still works"): + machine.succeed( + 'chroot-exec \'kill -9 $$ 2>&1 || :\' | ' + 'grep -q "Too many levels of symbolic links"' + ) + ''; + } ]; options.__testSteps = lib.mkOption { @@ -143,6 +157,15 @@ import ./make-test-python.nix { }; config.environment.systemPackages = lib.singleton testClient; + config.systemd.packages = lib.singleton (pkgs.writeTextFile { + name = "shipped-unitfile"; + destination = "/etc/systemd/system/shipped-unitfile@.service"; + text = '' + [Service] + SystemCallFilter=~kill + SystemCallErrorNumber=ELOOP + ''; + }); config.users.groups.chroot-testgroup = {}; config.users.users.chroot-testuser = { diff --git a/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix new file mode 100644 index 0000000000..4fc5864357 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix @@ -0,0 +1,85 @@ +import ./make-test-python.nix ( + let + + container = { + # We re-use the NixOS container option ... + boot.isContainer = true; + # ... and revert unwanted defaults + networking.useHostResolvConf = false; + + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + + # systemd-nspawn expects /sbin/init + boot.loader.initScript.enable = true; + + imports = [ ../modules/profiles/minimal.nix ]; + }; + + containerSystem = (import ../lib/eval-config.nix { + modules = [ container ]; + }).config.system.build.toplevel; + + containerName = "container"; + containerRoot = "/var/lib/machines/${containerName}"; + + in + { + name = "systemd-machinectl"; + + machine = { lib, ... }: { + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + services.resolved.enable = false; + + # open DHCP server on interface to container + networking.firewall.trustedInterfaces = [ "ve-+" ]; + + # do not try to access cache.nixos.org + nix.settings.substituters = lib.mkForce [ ]; + + virtualisation.additionalPaths = [ containerSystem ]; + }; + + testScript = '' + start_all() + machine.wait_for_unit("default.target"); + + # Install container + machine.succeed("mkdir -p ${containerRoot}"); + # Workaround for nixos-install + machine.succeed("chmod o+rx /var/lib/machines"); + machine.succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd"); + + # Allow systemd-nspawn to apply user namespace on immutable files + machine.succeed("chattr -i ${containerRoot}/var/empty"); + + # Test machinectl start + machine.succeed("machinectl start ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test systemd-nspawn network configuration + machine.succeed("ping -n -c 1 ${containerName}"); + + # Test systemd-nspawn uses a user namespace + machine.succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00"); + + # Test systemd-nspawn reboot + machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl reboot + machine.succeed("machinectl reboot ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl stop + machine.succeed("machinectl stop ${containerName}"); + + # Show to to delete the container + machine.succeed("chattr -i ${containerRoot}/var/empty"); + machine.succeed("rm -rf ${containerRoot}"); + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/tinywl.nix b/third_party/nixpkgs/nixos/tests/tinywl.nix index b286cab779..8fb87b5333 100644 --- a/third_party/nixpkgs/nixos/tests/tinywl.nix +++ b/third_party/nixpkgs/nixos/tests/tinywl.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; services.getty.autologinUser = "alice"; + security.polkit.enable = true; environment = { systemPackages = with pkgs; [ tinywl foot wayland-utils ]; diff --git a/third_party/nixpkgs/nixos/tests/vsftpd.nix b/third_party/nixpkgs/nixos/tests/vsftpd.nix new file mode 100644 index 0000000000..4bea27f0eb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/vsftpd.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "vsftpd"; + + nodes = { + server = { + services.vsftpd = { + enable = true; + userlistDeny = false; + localUsers = true; + userlist = [ "ftp-test-user" ]; + writeEnable = true; + localRoot = "/tmp"; + }; + networking.firewall.enable = false; + + users = { + users.ftp-test-user = { + isSystemUser = true; + password = "ftp-test-password"; + group = "ftp-test-group"; + }; + groups.ftp-test-group = {}; + }; + }; + + client = {}; + }; + + testScript = '' + client.start() + server.wait_for_unit("vsftpd") + server.wait_for_open_port("21") + + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server") + client.succeed('echo "this is a test" > /tmp/test.file.up') + client.succeed("curl -v -T /tmp/test.file.up -u ftp-test-user:ftp-test-password ftp://server") + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server/test.file.up > /tmp/test.file.down") + client.succeed("diff /tmp/test.file.up /tmp/test.file.down") + assert client.succeed("cat /tmp/test.file.up") == server.succeed("cat /tmp/test.file.up") + assert client.succeed("cat /tmp/test.file.down") == server.succeed("cat /tmp/test.file.up") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/zammad.nix b/third_party/nixpkgs/nixos/tests/zammad.nix new file mode 100644 index 0000000000..4e466f6e3b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/zammad.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + + { + name = "zammad"; + + meta.maintainers = with lib.maintainers; [ garbas taeer ]; + + nodes.machine = { config, ... }: { + services.zammad.enable = true; + services.zammad.secretKeyBaseFile = pkgs.writeText "secret" '' + 52882ef142066e09ab99ce816ba72522e789505caba224a52d750ec7dc872c2c371b2fd19f16b25dfbdd435a4dd46cb3df9f82eb63fafad715056bdfe25740d6 + ''; + + systemd.services.zammad-locale-cheat = + let cfg = config.services.zammad; in + { + serviceConfig = { + Type = "simple"; + Restart = "always"; + + User = "zammad"; + Group = "zammad"; + PrivateTmp = true; + StateDirectory = "zammad"; + WorkingDirectory = cfg.dataDir; + }; + wantedBy = [ "zammad-web.service" ]; + description = "Hack in the locale files so zammad doesn't try to access the internet"; + script = '' + mkdir -p ./config/translations + VERSION=$(cat ${cfg.package}/VERSION) + + # If these files are not in place, zammad will try to access the internet. + # For the test, we only need to supply en-us. + echo '[{"locale":"en-us","alias":"en","name":"English (United States)","active":true,"dir":"ltr"}]' \ + > ./config/locales-$VERSION.yml + echo '[{"locale":"en-us","format":"time","source":"date","target":"mm/dd/yyyy","target_initial":"mm/dd/yyyy"},{"locale":"en-us","format":"time","source":"timestamp","target":"mm/dd/yyyy HH:MM","target_initial":"mm/dd/yyyy HH:MM"}]' \ + > ./config/translations/en-us-$VERSION.yml + ''; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("zammad-web.service") + machine.wait_for_unit("zammad-websocket.service") + machine.wait_for_unit("zammad-scheduler.service") + # wait for zammad to fully come up + machine.sleep(120) + + # without the grep the command does not produce valid utf-8 for some reason + with subtest("welcome screen loads"): + machine.succeed( + "curl -sSfL http://localhost:3000/ | grep 'Zammad Helpdesk'" + ) + ''; + } +) diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix new file mode 100644 index 0000000000..9200a36f9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -0,0 +1,76 @@ +{ + stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, fetchzip +, freetype +, jansson +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXrandr +, libarchive +, liblo +, libsamplerate +, mesa +, pkg-config +, python3 +, speexdsp +}: + +stdenv.mkDerivation rec { + name = "cardinal-${version}"; + version = "22.02"; + + src = fetchurl { + url = + "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; + sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + }; + + patches = [ + # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 + (fetchpatch { + url = + "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; + sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; + }) + ]; + + prePatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + jansson + libGL + libX11 + libXcursor + libXext + libXrandr + libXrandr + libarchive + liblo + libsamplerate + mesa + python3 + speexdsp + ]; + + makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + + meta = { + description = "Plugin wrapper around VCV Rack"; + homepage = "https://github.com/DISTRHO/cardinal"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index 87ae31aed3..bebc0320bb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-faVLPHPQ4voR/RHiPpUwnZK+5Jx0u4rJWuH5zlydzwY="; + sha256 = "sha256-A0QmyphjsNU06kh2f9rXrR+GkDEI5HqXRA9J82E6qJU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index a5fc9a8789..7e0fcf2717 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.51"; + version = "1.52"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-g8LZhP6qHctmvbmrhJ8gAOeAd57SePeO2tdFi9SVjQ0="; + sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix index 76105d327b..9739a88586 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wSlZ9pVVqlrPSz20pRdcRLq6pTcibxD7326l9WY7ZDY="; + sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix index 743417570c..1fb848ae1e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix @@ -12,7 +12,6 @@ with lib; let pname = "goattracker" + optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { - type = "Application"; name = pname; desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; genericName = "Music Tracker"; @@ -20,8 +19,8 @@ let then "gt2stereo" else "goattrk2"; icon = "goattracker"; - categories = "AudioVideo;AudioVideoEditing;"; - extraEntries = "Keywords=tracker;music;"; + categories = [ "AudioVideo" "AudioVideoEditing" ]; + keywords = [ "tracker" "music" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix index dc8bf53026..798af97ab3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc + rustPlatform.bindgenHook ]; buildInputs = [ @@ -49,8 +50,6 @@ stdenv.mkDerivation rec { pipewire ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; - meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix index b4d4a02878..16683564b2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix @@ -38,19 +38,15 @@ mkDerivation rec{ desktopItems = [ (makeDesktopItem { - name = "jamesdsp.desktop"; + name = "jamesdsp"; desktopName = "JamesDSP"; genericName = "Audio effects processor"; exec = "jamesdsp"; icon = "jamesdsp"; comment = "JamesDSP for Linux"; - categories = "AudioVideo;Audio"; + categories = [ "AudioVideo" "Audio" ]; startupNotify = false; - terminal = false; - type = "Application"; - extraDesktopEntries = { - Keywords = "equalizer;audio;effect"; - }; + keywords = [ "equalizer" "audio" "effect" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix index f30b188c39..8c67c0fd7c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-QtlvcKVqKgRAO/leHy4CgvjNW49HAyZLI2JtKERP7HQ="; + sha256 = "sha256-K2HznkntDhp+I8DHJk5Cuh5cR8yjwfzX+pGGzS8yVLQ="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix index b40dbfe65b..81c792d95e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix @@ -15,7 +15,7 @@ let icon = "${placeholder "out"}/share/lyrebird/icon.png"; desktopName = "Lyrebird"; genericName = "Voice Changer"; - categories = "AudioVideo;Audio;"; + categories = [ "AudioVideo" "Audio" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 76e1bc3923..72027fe922 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -11,7 +11,6 @@ , wrapGAppsHook , fetchurl , fetchFromGitHub -, makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "netease-cloud-music-gtk"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix b/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix index eedd193b2c..78f71ed950 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "sha256-hcw+Fn5s1S786eqmR95RmkFcIaRzWaH38YE9DXVQJU0="; + sha256 = "sha256-dQE7kUoxqDtTrk5euHqpMVeApxniecWZWOARcCl573o="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - homepage = "https://linuxaudio.github.io/new-session-manager/"; + homepage = "https://new-session-manager.jackaudio.org/"; description = "A session manager designed for audio applications."; maintainers = [ maintainers._6AA4FD ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index a66a4602bc..4f0ca02b62 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "pZy2afj7g6wnOIHH3ecCYUX7/NX5op4aLSHe4/GbI5L9NUuFGoJIWWuVbv2kngcTo+XUqP0yoe0Ns+I4WulDVA=="; + sha512 = "Nh0+/ibZnjcGXgQUe+QvukWpaX6/0nNPR4NIK0i2Bn6kBkihv9bkfF9xGpgqeE6H3CK+4e6ywg8y9RR+pJBBSA=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/39"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/41"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix index 56f4d6da05..d8f5357efd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plujain-ramp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - version = "v1.1.3"; + version = "1.1.3"; pname = "plujain-ramp"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 89d5370fd0..3ecfde7819 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.04"; + version = "6.2.07"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-xzEgj4pjW+y46CXtVq4myHKX6DImCibsUz8m0G6F+YQ="; + sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index a44dd941c5..05e6fac55f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.40"; + version = "1.41"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-0qEhhkprIpseCEFStgJ0035TX0e9s271BK/1hVkn/JU="; + sha256 = "sha256-FnGtUoA6ol4lqp5HXjoJ3CHjdRs8eML0WI917ruid84="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix index 96053d08d0..af22a9dce6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix @@ -1,8 +1,7 @@ { lib , fetchFromGitHub -, genericUpdater +, gitUpdater , substituteAll -, common-updater-scripts , ffmpeg , python3Packages , sox @@ -33,12 +32,7 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; - passthru = { - updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix index 9d4118a439..fae8700d81 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "REW"; genericName = "Software for audio measurements"; - categories = "AudioVideo;"; + categories = [ "AudioVideo" ]; }; responseFile = writeTextFile { diff --git a/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix index e8a275db98..0af80c991c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rubyripper/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, cdparanoia, cddiscid, ruby }: + stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.8.0rc3"; pname = "rubyripper"; - src = fetchurl { - url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; - sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; + + src = fetchFromGitHub { + owner = "bleskodev"; + repo = pname; + rev = "v${version}"; + sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f"; }; preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ruby cdparanoia ]; - postInstall = '' - wrapProgram "$out/bin/rrip_cli" \ - --prefix PATH : "${ruby}/bin" \ - --prefix PATH : "${cdparanoia}/bin" + + buildInputs = [ + cddiscid + cdparanoia + ruby + ]; + + postFixup = '' + wrapProgram $out/bin/rrip_cli \ + --prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]} ''; meta = with lib; { description = "High quality CD audio ripper"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; + homepage = "https://github.com/bleskodev/rubyripper"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix index 976c4ab570..e3e6573c43 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { icon = "SonyHeadphonesClient"; desktopName = "Sony Headphones Client"; comment = "A client recreating the functionality of the Sony Headphones app"; - categories = "Audio;Mixer;"; + categories = [ "Audio" "Mixer" ]; }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix index 1d53c2f4ce..2ec9562c62 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sptlrx"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "raitonoberu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk="; + sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE="; }; - vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08="; + vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 6527b90b89..b607e2c9a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-MlS1ShRXfsTMs97MeExW6sfpv40OcQLDIzIzOYGk7Rw="; + sha256 = "sha256-/pwHWmQTV1QBK+5SS0/NC6wMm2QQm+iCZArxiHjn4M4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 444443cd10..d9effb3f1a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.1.1"; + version = "7.1.3"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-eVliTSFTBG56mU1Crt3syoYxKclz/6W15y/30C+Tf1g="; + sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix new file mode 100644 index 0000000000..4a0035aadf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, alsa-lib }: + +rustPlatform.buildRustPackage rec { + pname = "termusic"; + version = "0.6.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg="; + }; + + cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Terminal Music Player TUI written in Rust"; + homepage = "https://github.com/tramhao/termusic"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix index a3518f2398..f696c50618 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix @@ -1,26 +1,35 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson +, mpg123, ffmpeg, libvorbis, libao, jansson, speex }: +let + vgmstreamVersion = "r1702-5596-00bdb165b"; +in stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "r1050-3448-g77cc431b"; + pname = "vgmstream"; + version = "unstable-2022-02-21"; src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = version; - sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + owner = "vgmstream"; + repo = "vgmstream"; + rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; + sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; }; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; - # There's no nice way to build the audacious plugin without a circular dependency - cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + cmakeFlags = [ + # There's no nice way to build the audacious plugin without a circular dependency + "-DBUILD_AUDACIOUS=OFF" + # It always tries to download it, no option to use the system one + "-DUSE_CELT=OFF" + ]; - preConfigure = '' - echo "#define VERSION \"${version}\"" > cli/version.h + postConfigure = '' + echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh new file mode 100755 index 0000000000..5353480dd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then + echo "ERROR: Not in the vgmstream folder" + exit 1 +fi + +if [[ ! -v GITHUB_TOKEN ]]; then + echo "ERROR: \$GITHUB_TOKEN not set" + exit 1 +fi + + +payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' </dev/null \ + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags --url=https://github.com/$(getRepo) 2>/dev/null \ | sort -V | tail -1 | sed 's|^v||' } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix index 6fd91495b4..773071c049 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix @@ -59,9 +59,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Private cryptocurrency based on Monero"; - homepage = "https://oxen.io/"; - license = licenses.bsd3; - platforms = platforms.all; + homepage = "https://oxen.io/"; + license = licenses.bsd3; + platforms = platforms.all; maintainers = [ maintainers.viric ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/oxen.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/pivx/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/pivx/default.nix index fd562edf93..75d0aa7ebf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/pivx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/pivx/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://pivx.org"; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 0b90fc10bb..f8e20f1a05 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; - categories = "Network;Utility;"; + categories = [ "Network" "Utility" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 540c59586a..12324088b0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -159,14 +159,14 @@ let }; desktopItem = makeDesktopItem { - name = drvName; + name = pname; exec = pname; - icon = drvName; + icon = pname; desktopName = "Android Studio (${channel} channel)"; comment = "The official Android IDE"; - categories = "Development;IDE;"; - startupNotify = "true"; - extraEntries="StartupWMClass=jetbrains-studio"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools @@ -216,9 +216,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ meutraa fabianhjr ]; - beta = [ meutraa fabianhjr ]; - canary = [ meutraa fabianhjr ]; + stable = [ fabianhjr ]; + beta = [ fabianhjr ]; + canary = [ fabianhjr ]; dev = canary; }."${channel}"; }; @@ -229,6 +229,6 @@ in runCommand echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} - ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png + ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 3654a75fd8..2b58ba50bc 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.155.0"; + version = "1.156.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-k6ALTbA2PhMZscinXKceM7MSzgr759Y6GxMrQAXMgwM="; + sha256 = "sha256-waVTNyK3OHpOvBJrXio+Xjn9q3WmUczbx3E26ChsuKo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 84f21e5ea2..9ae3c1c33c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -16,23 +16,23 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.01.20", - "sha256": "sha256-4UJ6t8j8uHB27jprqnlsGB8ytOMQLe4ZzSaYKiw4y70=" + "rev": "2022.02.19", + "sha256": "sha256-cq2dirFNPaWRmZJu0F+CFA//+SuFOOpTH3Q5zL4oPQo=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.12.28", - "sha256": "sha256-bXTjPdn0DIVTdoi30Ws5+M+UsC7F99IphMSTpI5ia/Q=" + "rev": "2022.01.21", + "sha256": "sha256-el5YtzewnHV0fRPgVhApZUVP7huSQseqrO2ibvm6Ctg=" }, "EControl": { "owner": "Alexey-T", - "rev": "2022.01.07", - "sha256": "sha256-dgkyXrFs2hzuFjt9GW+WNyrLIp/i/AbRsM/MyMbatdA=" + "rev": "2022.02.02", + "sha256": "sha256-T/6SQJHKzbv/PlObDyc9bcpC14krHgcLDQn0v2fNkLM=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.01.20", - "sha256": "sha256-CaGo38NV+mbwekzkgw0DxM4TZf2xwHtYFnC6RbWH+ts=" + "rev": "2022.02.01", + "sha256": "sha256-FAcq6ixmFPQFBAGG2gqB4T+YGYT+Rh/OlKdGcH/iL3g=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -41,8 +41,8 @@ }, "Emmet-Pascal": { "owner": "Alexey-T", - "rev": "2020.09.05", - "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" + "rev": "2022.01.17", + "sha256": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw=" }, "CudaText-lexers": { "owner": "Alexey-T", diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/update.sh b/third_party/nixpkgs/pkgs/applications/editors/cudatext/update.sh index 8389b3e8a7..f7aae6ff8b 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/update.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/update.sh @@ -18,6 +18,6 @@ while IFS=$'\t' read repo owner rev; do url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix hash to-sri --type sha256 $hash) - jq ".${repo}.rev = \"${latest}\" | .${repo}.sha256 = \"${sriHash}\"" deps.json | sponge deps.json + jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".sha256 = \"${sriHash}\"" deps.json | sponge deps.json fi done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json) diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index 29c063633f..3b497f34a4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { comment = "Integrated Development Environment"; desktopName = "Eclipse IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" 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 007352ef84..54bcc3a7c0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.16"; + version = "13.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.16.tar"; - sha256 = "1r9piq4js45knw8sf73kk8jjinmx4m2mdinc98xrklnwcffw7hjf"; + url = "https://elpa.gnu.org/packages/auctex-13.1.1.tar"; + sha256 = "193sqq2wiq3lg99m8hifl9rjxdazpy638r99sqvmxmkfm98cr34r"; }; packageRequires = [ emacs ]; meta = { @@ -309,10 +309,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.tar"; - sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx"; + url = "https://elpa.gnu.org/packages/bbdb-3.2.1.tar"; + sha256 = "01vsnifs47krq1srgdkk9agbv3p2fykl9nydr4nrfjxbqpnyh3ij"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -951,10 +951,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.3.tar"; - sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7"; + url = "https://elpa.gnu.org/packages/devdocs-0.4.tar"; + sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm"; }; packageRequires = [ emacs ]; meta = { @@ -1176,10 +1176,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar"; - sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.12.tar"; + sha256 = "1k53crdmaw6lzvprsmpdfvg96ck54bzs4z1d4q9x890anglxq5m6"; }; packageRequires = [ emacs seq ]; meta = { @@ -1236,10 +1236,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220212"; + version = "20220224"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220212.tar"; - sha256 = "1w04jwh8y6l1fgx6sahwj9znw9cm83a1lld5vdgnbsww2m5nk8zm"; + url = "https://elpa.gnu.org/packages/eev-20220224.tar"; + sha256 = "008750fm7w5k9yrkwyxgank02smxki2857cd2d8qvhsa2qnz6c5n"; }; packageRequires = [ emacs ]; meta = { @@ -1394,10 +1394,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "9"; + version = "10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-9.tar"; - sha256 = "12p9nigzyrlpkfvg7v76jmcfs08z84gggnx7h4frdaim3kx5y6xf"; + url = "https://elpa.gnu.org/packages/emms-10.tar"; + sha256 = "1lgjw9p799sl7nqnl2sk4g67ra10z2ldygx9kb8pmxjrx64mi3qm"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2043,10 +2043,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar"; - sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.4.tar"; + sha256 = "11q9sdi6l795hspi7hr621bbra66pxsgrkry95k7wxjkmibcbsxr"; }; packageRequires = [ emacs ]; meta = { @@ -2622,10 +2622,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar"; - sha256 = "15d1ywj8k4yh57arzv7z2ir49gf2j7a80pscrfgxsypnyl2dkkfa"; + url = "https://elpa.gnu.org/packages/modus-themes-2.2.0.tar"; + sha256 = "1vgwr9q16d3hjwmqljmmzlpn177gvwbk3wg4l1fmgc5bpb7k78ky"; }; packageRequires = [ emacs ]; meta = { @@ -3160,10 +3160,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.4.tar"; - sha256 = "0712y22cl6i98jlhmsm436v0mlmscbypc15sdkn704a491ipq2qj"; + url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar"; + sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj"; }; packageRequires = [ emacs ]; meta = { @@ -3220,10 +3220,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.16"; + version = "0.4.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar"; - sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar"; + sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9"; }; packageRequires = [ emacs ]; meta = { @@ -3650,10 +3650,10 @@ elpaBuild { pname = "repology"; ename = "repology"; - version = "1.1.0"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/repology-1.1.0.tar"; - sha256 = "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90"; + url = "https://elpa.gnu.org/packages/repology-1.2.2.tar"; + sha256 = "0ggb0zgz24hs5andhyrlpqm0gda0gf1wynzkarj4z7gpk5p9wrpr"; }; packageRequires = [ emacs ]; meta = { @@ -3727,6 +3727,21 @@ license = lib.licenses.free; }; }) {}; + satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "satchel"; + ename = "satchel"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/satchel-0.2.tar"; + sha256 = "1ajsfrr988nglw2l4kqjbbdq9x8gidv0ymsrg3jm2b9nisfhnixv"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/satchel.html"; + license = lib.licenses.free; + }; + }) {}; scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "scanner"; @@ -4294,10 +4309,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.1"; + version = "2.5.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar"; - sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar"; + sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r"; }; packageRequires = [ emacs ]; meta = { @@ -4305,6 +4320,21 @@ license = lib.licenses.free; }; }) {}; + tramp-nspawn = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tramp-nspawn"; + ename = "tramp-nspawn"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.tar"; + sha256 = "1si649vcj4md50p5nzvw431580rcl113rraj6fw636a394485hvx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html"; + license = lib.licenses.free; + }; + }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; @@ -4903,10 +4933,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.3.2.tar"; - sha256 = "1bwvli2d6d06gh004hnbbwy6rkn0jv1d1s7slfladqjjdkpjvpzd"; + url = "https://elpa.gnu.org/packages/xref-1.4.0.tar"; + sha256 = "1ng03fyhpisa1v99sc96mpr7hna1pmg4gdc61p86r8lka9m5gqfx"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 37559b0536..60028dc995 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 @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar"; - sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar"; + sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx"; }; packageRequires = []; meta = { @@ -1825,10 +1825,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.3.tar"; - sha256 = "1hg5hr5jma5v4rilchwyyw1fzm8lkfd3fxay0sb9dgzrgypvh5am"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.4.tar"; + sha256 = "137z04h29cgy1dmkf2cnchlfzqs4f5v3cc9gv9qxisw9dswlvdvk"; }; packageRequires = [ emacs ]; meta = { @@ -2210,10 +2210,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.0.4"; + version = "17.1.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar"; - sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar"; + sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n"; }; 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 a45ebde817..0afde2c5c3 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 @@ -1893,8 +1893,8 @@ "deps": [ "consult" ], - "commit": "425e46cbc44d532b5bcacd90ad55b784834e536b", - "sha256": "0r51mf9s2cbh3qq4y04rc4b5x6b4qfqd5n5ix8xsq5x154ivmfcj" + "commit": "4d65f37a22425cf41c02862522a76e5688998591", + "sha256": "051k54mrq03574lni5nqabmhpbcgpjlm0vjn0yi7h4g0wl299ab6" }, "stable": { "version": [ @@ -2545,8 +2545,8 @@ "deps": [ "all-the-icons" ], - "commit": "8a914b100348493a665f0d53de4e22bf5b30a2a5", - "sha256": "02rymhafqd2amazi2ds39vf5p01lfa75k5vyary3zrk2q01x1ba3" + "commit": "67a331c94af7670a89cea2cd58a1e7b11b83e8a9", + "sha256": "1aq1g81hj9c8z6h3aw9jdiq9x531kdysdifcr6q7p2bd0vcjd79m" }, "stable": { "version": [ @@ -2601,15 +2601,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220217, - 604 + 20220219, + 1054 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "d2658536b58cb42e9f2dac551d42055b734552ba", - "sha256": "0mn5dqcfs4z5lsl5104zf7km819xcxpmdk3v7r9dnrnny3al7qfi" + "commit": "2aca118abec76886a0689bcb4b6ba1049ff4e297", + "sha256": "0h6sq20pg3g68p4a0ziy8n41h236q9vfc21wx7qs5g9v6k3pbdng" }, "stable": { "version": [ @@ -2675,8 +2675,8 @@ 20220212, 1526 ], - "commit": "2a61756abccb9cf3c0e353ca894ce5d5bee0f93b", - "sha256": "0la0bwnbbjbdmhxhz77s48icqfrf3axl2xgbc82cz93axd67y530" + "commit": "583ed2d65310eddcb1d5d82af236c9ed86560447", + "sha256": "1a3xk7cyxp63957mk3msrj166yq61zwyckdc7qd2l9s3spbsdq0j" }, "stable": { "version": [ @@ -3189,11 +3189,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220128, - 1118 + 20220225, + 1955 ], - "commit": "0cfad246ee4c1297efa399e3d2c6ebb8bb46288b", - "sha256": "1g4gyf087h98njzzjj23n114zhrlg2z1ab7d3v4438wph6c7my14" + "commit": "5bf59f80389d03f11bc0daa7b9cb24a0bc29f6c5", + "sha256": "0xkv0b8d8zywv86160bxhb5z7v401lzgqssagk08rzvb3vrrjf31" }, "stable": { "version": [ @@ -3231,8 +3231,8 @@ 20200914, 644 ], - "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", - "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" + "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", + "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" }, "stable": { "version": [ @@ -4087,8 +4087,8 @@ "deps": [ "yaml" ], - "commit": "ad00c5eb90f189223ef8a0b49c1dc5fef1ef26b0", - "sha256": "0wrwqr79swsj4jmvnn0ljzymjmp1rr4al37qibagl6pj8vfdqim0" + "commit": "47aa63d320c39f8566a8d95c61f27383f561b001", + "sha256": "0rc0m0w8z5mz0mkyh05kjcnz9wzjvs92ygyh934zwl8a3lk566sk" }, "stable": { "version": [ @@ -4296,8 +4296,8 @@ 20201026, 339 ], - "commit": "3abed97b7a139b07a89fb2a8434c794892a3f96a", - "sha256": "05wdi6bab8avy6512q09fdwfn6vl9d1xjvrrs2m2mj9gl31anli2" + "commit": "15ab7db5d188083f09d65163edd5d0ef995c4c30", + "sha256": "05fgd7h75jrzblgs8ydkd30pgjhr16ng4l4k32wr4wwqn213ag97" }, "stable": { "version": [ @@ -4320,8 +4320,8 @@ 20210731, 609 ], - "commit": "8cc7ce7f5a7366ab3532c074b09ae716a8396713", - "sha256": "10pkh1n1ay5jqfh59l42kl9z76d5397ak3rak6l1gg55jy7xjkh2" + "commit": "da34a3950b80bb43cc1e8b4aa404b761372dd149", + "sha256": "04jjgcs7h2bxxjqhsi65iwgf5jg912lgingfq3yd9dkcbw9nmcfc" }, "stable": { "version": [ @@ -4614,15 +4614,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20210516, - 556 + 20220222, + 640 ], "deps": [ "keytar", "s" ], - "commit": "35781cc09d578a72f4a63d674753570a1df6a301", - "sha256": "0krrgif4zvsr7ggnh6qpclcc8pc2lfdn0785as3iqd0hmgxgyd4m" + "commit": "c7b5893e0d93ac6a653e58161b42dc2b21793711", + "sha256": "1w9i58dg0l23dry0aj3cvb842fd33z9hngq0a7rikacmympz95r9" }, "stable": { "version": [ @@ -5086,14 +5086,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220103, - 1602 + 20220223, + 1622 ], "deps": [ "ht" ], - "commit": "d7a924febb2aa3ce6ce88ec31e317522e4965ff4", - "sha256": "08gmvq5ywh338ss99mvb9hc1p93dvq6hn6294kyp7v6svmrsgzjj" + "commit": "db22c24d13532e80ce02c2f51f41f6c979cf0604", + "sha256": "0z1frm9kicrlb63iyk7wa5dpvy92ygh5vxaw2kv1rvnfbsfmxl7b" }, "stable": { "version": [ @@ -5242,8 +5242,8 @@ 20210805, 1344 ], - "commit": "8d5cf320b7e151577bd1cb69541253f3b8fd0eaf", - "sha256": "1j2g4qzyw8l21bvw4gmah62a2z0dvblasvagd66jghdnvraz4rf6" + "commit": "beb7a4d2b15790502ac52f65588da3d23567f9db", + "sha256": "1pv88hrld0zifd7w52kqlx04fx3vfzrp56kzd2jk0fn3pvqdi5n7" }, "stable": { "version": [ @@ -5648,15 +5648,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211020, - 111 + 20220221, + 1638 ], "deps": [ "avy", "embark" ], - "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", - "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -6438,11 +6438,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20220208, - 1818 + 20220222, + 1616 ], - "commit": "90ff1d9b4c39ecb53bf1b0992d3c44049bc4b4eb", - "sha256": "0wfw0gdlx9xx874wqhi6nn23zw10anyrppz5ca2i7h3fqr2x72fk" + "commit": "e07a16666154c8ddc65ddaae599d58b25727350d", + "sha256": "0kdlhp3h2kkijxsmd7jhrbb1dgs6x5q3gpw4qv5ij89xrlxanz7d" } }, { @@ -6483,11 +6483,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20220211, - 546 + 20220224, + 403 ], - "commit": "1172bd901e29f5c001d52ef521b2b3ae50f3110c", - "sha256": "1cs0wsa4dr01rhdfqf28psmmbf0vpiazxk755r6vclxzr69cf3z6" + "commit": "00a003c9a3788c3a0fe8bd89b827b4e9bbdf2261", + "sha256": "0iskn78ynz24wdbq1ja24m0pqcbhb4dfipnxx0nijdsbf6xpj37r" }, "stable": { "version": [ @@ -6879,8 +6879,8 @@ 20210715, 1004 ], - "commit": "1df6e44fcb5a1d579a5f3b39b6e9256a4e8f3b9f", - "sha256": "0l3ji8w1fvzc0i2j9lp6w20pm9sbnz48iaais44jb0yi39b7mmy8" + "commit": "e6e73647e4c176ff4f89e09d54dae753f95c7a03", + "sha256": "06r3b4wggam2a0n87cnlkxsn16aam9c0wdi6niw6sainjmk0dw8g" }, "stable": { "version": [ @@ -7074,8 +7074,8 @@ "a", "pdf-tools" ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -7577,26 +7577,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220213, - 1310 + 20220227, + 1237 ], "deps": [ "a" ], - "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", - "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" + "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", + "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" }, "stable": { "version": [ 0, - 3, - 9 + 4, + 3 ], "deps": [ "a" ], - "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", - "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" + "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", + "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" } }, { @@ -9875,11 +9875,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220214, - 1115 + 20220227, + 316 ], - "commit": "e5e11f30f0b6ed0a2b283d5d3dec84bcd36557fc", - "sha256": "0qxypl6ghr31idgn2mvwgjkp1fhjlhwjldnqim4l658yxivh2jyz" + "commit": "fc7a20be524d0faa848ba2a16a80767a445a1391", + "sha256": "1dwbvixk2zr2k061zrljr933l2gpkx672d1d67gbz5znz4sbjsgh" }, "stable": { "version": [ @@ -9901,8 +9901,8 @@ 20210707, 2310 ], - "commit": "767b8a30ee100f1c648a75c9aaf252212d904c17", - "sha256": "0hdfi052yfmsfzx00wxmsk129vvxdhcgixnyjaf13kamg2xm69im" + "commit": "fe82ae30fcd53dbe3c9ae7e14e495a79ac7a9c74", + "sha256": "02z2ss5kqmda32x4pwrjwqly2ia2wyw47pny6hh93mzpc453lmj0" }, "stable": { "version": [ @@ -10271,8 +10271,8 @@ 20210501, 820 ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -10320,8 +10320,8 @@ 20200904, 1431 ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -10455,15 +10455,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20220112, - 1239 + 20220224, + 808 ], "deps": [ "cl-lib", "powerline" ], - "commit": "cde3469d77f83b0877f2a7c727ca101cfeb86401", - "sha256": "12msyfz54am5n9qwm2igjp0cfczm9h6z5phay5ya75cdm0bmxby4" + "commit": "f4cef95acbd2eb99c8db3b6cdde74a6e0a966a0a", + "sha256": "10vpy22g2ccrj00kycrjcywywc69hqf3dm7vcbmmw7ralh9vclbc" }, "stable": { "version": [ @@ -10590,8 +10590,8 @@ 20171115, 2108 ], - "commit": "62380f6c464be1f773820db99d3529277e427e1f", - "sha256": "16w4njjv1z67syx1w2vi7vbf2n78r33jjcq74bwk3hqv440nq95f" + "commit": "64122d4a77d76689558412b55962cab60524c67c", + "sha256": "1a80pfhys8ja1nh32d3xqab0f7f1k3k5mzsvscnivk90cmsrakhb" }, "stable": { "version": [ @@ -10644,30 +10644,30 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20210129, - 2037 + 20220221, + 1029 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" } }, { @@ -11062,14 +11062,20 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220214, - 311 + 20220221, + 1556 ], - "deps": [ - "magit" + "commit": "0b25d312a84868d6cf76f2016cd0dbc70c9312a0", + "sha256": "0mqrxzk0skkc3wj3b44k10nnrg542jnh8s226v1mx4dbcxws8rdy" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], - "commit": "e037884556aec7f4f6b830a6f44b1dcb51120d40", - "sha256": "11hmipc7ia4zsbdw000ii7n9ck1fhlbvfz5jznfiqfgwyamacd8z" + "commit": "d493925f93d5e0badb04a5331bbc8741b0cb04ca", + "sha256": "13y3fvkw4vfiaibxgdvrxkca9lacfwfjddk8wrrind92q2p2ph2n" } }, { @@ -11239,16 +11245,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220215, - 1904 + 20220224, + 1017 ], "deps": [ "dash", "seq", "ts" ], - "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", - "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -11292,14 +11298,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220215, - 1904 + 20220225, + 950 ], "deps": [ "chronometrist" ], - "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", - "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -11329,8 +11335,8 @@ "chronometrist", "spark" ], - "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", - "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" + "commit": "7cf2c86afd8f6fb6235320ac9f7ebd76153d8bc6", + "sha256": "1gw69ps98bc28kwfqi6m9v4im71jla410ici5cyhfyk67m3dvgbb" }, "stable": { "version": [ @@ -11402,8 +11408,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220216, - 732 + 20220222, + 1710 ], "deps": [ "clojure-mode", @@ -11413,8 +11419,8 @@ "sesman", "spinner" ], - "commit": "7afa8ac74b1e511387ac9bfe5b0bee83c1dbb943", - "sha256": "0nhvn0jrpkzzjv94b98l293pfbibfx2srlck5ycdi3760lk4k6vh" + "commit": "7a072d8374eb92c8164b436ee271abb5e9e351e3", + "sha256": "098h86i41dqxydmhx9akiyixnz846i7jhl1hcsz7dnwl7ibbz14k" }, "stable": { "version": [ @@ -12179,14 +12185,14 @@ "repo": "jpe90/emacs-deps-new", "unstable": { "version": [ - 20220109, - 1459 + 20220221, + 2235 ], "deps": [ "transient" ], - "commit": "a39214123ed46b62403b1b557dbdac0efc04546a", - "sha256": "0bs38sg6md06vzbj2w0j0ikd4cqqnn0cfdpy13mg6fd8xxmf5irw" + "commit": "183089e6d4ded90efff491916e1c87411ead0461", + "sha256": "0a4fz838mxcv42z3r5h1i7nlqpl1ipqc6ljlgbhvz5hw6bd0p96w" } }, { @@ -12459,11 +12465,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220202, - 1341 + 20220222, + 827 ], - "commit": "913e2450a77a6ddda051f55ac651c99337147db1", - "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w" + "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", + "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" }, "stable": { "version": [ @@ -12489,8 +12495,8 @@ "deps": [ "clojure-mode" ], - "commit": "913e2450a77a6ddda051f55ac651c99337147db1", - "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w" + "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", + "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" }, "stable": { "version": [ @@ -12792,8 +12798,8 @@ 20210104, 1831 ], - "commit": "77871555de842d837170c9f7add1971385468c40", - "sha256": "0xv3qxbckv5488kypfn9krlk5pc4hkf3zk3zm130310d3vbf3ff2" + "commit": "a2513bb55e05bb503f6c0a0122eed17a33aa1354", + "sha256": "0jgjn78y3kmfmzyhvp3j0lclaxfpa8im7d8gvvzr5qv1j83dprdr" }, "stable": { "version": [ @@ -12801,10 +12807,10 @@ 23, 0, -1, - 1 + 2 ], - "commit": "a15cc7706da8f4a1833539be3f37fbc63ee20e36", - "sha256": "1wbs5z1gd0gi6m79jqp6chhgisk4j8z9x6i91094d98yplnmrwgl" + "commit": "352ea99bbacf6e57bca47f43725d98b2a4a0b87d", + "sha256": "1dg1lk5f8qpx0scp33yqvbmwxaci484bawm70l9wkx8q2zjsljsh" } }, { @@ -13456,8 +13462,8 @@ "deps": [ "s" ], - "commit": "0ef51fac2fda5d890e53c2f24c9f1b1859b05ad1", - "sha256": "0gfgy6jvdmh6p069g4imssz6330p2kx1vbprjnqj7q34knkpv37i" + "commit": "fd84b0e32a0faa450df6035fb94ce96aa777b237", + "sha256": "0gb30gyadxvc47zrvkjkjil3qj6mxavxagzyp21jlxx7fn3n0fic" }, "stable": { "version": [ @@ -14249,8 +14255,8 @@ "emojify", "ht" ], - "commit": "059e1686d2132b2fb03dabf87cf7ad12201ccfef", - "sha256": "0gv9pa75pfr5xi4ryjf4qc4fs4vv3w1a52b0mwcwixbl9c6x34fr" + "commit": "01cbc9bf1b073abc5cf567479a3cf4b6f929d474", + "sha256": "115smqwz19c4pxh3asg046kq0pmdnwj2qz1s36h833kzz1ig3rn2" }, "stable": { "version": [ @@ -14345,16 +14351,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220210, - 305 + 20220222, + 613 ], "deps": [ "company", "ht", "s" ], - "commit": "56bbdd6e878bd7bbdc7c6306ed721792d594a131", - "sha256": "1dkrwa8xjzws27lz6f31mb45kwwswv4p9hdzpbkibznf40pmgdp6" + "commit": "122cdecee0a269b014471875f3eb29cd8af96d6e", + "sha256": "1wnh11m9pqlin58izx5w72a807pi59dj7mfhl5jfvsk7ds29yb04" }, "stable": { "version": [ @@ -15138,8 +15144,8 @@ "company-quickhelp", "popup" ], - "commit": "d89313233663dc7b49291feb1e464471dee3e759", - "sha256": "06s4fi7xdhyzp4xbv12kcs699wqxzrvfcg02fz4p4bbm9nsi3l69" + "commit": "5bafab30e0edb99a3064edf1e9265a416c632a71", + "sha256": "0nbncspzxrqqn7gsaapwy3dqd00gxzzjcf7xl0i8g1glsw4nwabv" }, "stable": { "version": [ @@ -15998,11 +16004,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220217, - 1627 + 20220227, + 1400 ], - "commit": "44580944f95d52bcd5a3ed79adef57e51aca7e31", - "sha256": "0b05vxialpal5ddmahls1lfnlm9wi5c622mvlikr0qis0000bglp" + "commit": "782a90da29568a79259464c1c11854a3e16ea36e", + "sha256": "01f16chhk4s53xmrl6c3a4nac8qmx6cdwlmxkhnc7a032njgd9bi" }, "stable": { "version": [ @@ -16222,6 +16228,25 @@ "sha256": "07qbm5p4cfrrwyp8a5sw0wkdhnqbappz4xjlnjil2krhj9g39q78" } }, + { + "ename": "consult-project-extra", + "commit": "c7df62c7b77134617aa018025736a37760fad471", + "sha256": "0s77hk2iq0q77cdw1j805a5w74hrcj6fvpwk1y9yy0bp0w4gcr4m", + "fetcher": "github", + "repo": "Qkessler/consult-project-extra", + "unstable": { + "version": [ + 20220222, + 1825 + ], + "deps": [ + "consult", + "project" + ], + "commit": "b2a7062251b101aa9d1ba6c1f3f65c69ebdfd784", + "sha256": "14ji1vjj265j0chn3fk9ncm4l66j6jq0g2nq5qz94qnpk1fadf8s" + } + }, { "ename": "consult-projectile", "commit": "ba7bac7fc95ba11094d3ad64d658be0ec7a16817", @@ -16230,15 +16255,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20211018, - 1718 + 20220225, + 1544 ], "deps": [ "consult", "projectile" ], - "commit": "29a7e54dbeb8e5d5e07c0546e60f6a7a6b79bbb8", - "sha256": "1n4hv4yb0pysbcv4rb3xw3550jzz6msi91ghxmvl7nf7shvd9gg7" + "commit": "758cfc259ae83421d008731642ff1ada41b7b514", + "sha256": "0fsqz88xplbkr6hl8zwmg65s3d8jjfnvf2bdfv795i0n8lsprl3c" } }, { @@ -16249,14 +16274,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20211113, - 1958 + 20220227, + 2050 ], "deps": [ "consult" ], - "commit": "42dea1d40fedf7894e2515b4566a783b7b85486a", - "sha256": "0nzch4x58vgvmcjr6p622lkzms2gvjfdgpvi6bbj5qdzkln5q23a" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" }, "stable": { "version": [ @@ -18477,6 +18502,24 @@ "sha256": "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w" } }, + { + "ename": "cycle-at-point", + "commit": "033260c71bef524da774f7b51e744b919f1a7145", + "sha256": "1h8ar6dhfk2irbk90hnbxp1l5lmb48rr6r7yj24c9yc8manxyxjn", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-cycle-at-point", + "unstable": { + "version": [ + 20220220, + 431 + ], + "deps": [ + "recomplete" + ], + "commit": "ea22b90f35f4cef73387047b3ef3fad83787d4e2", + "sha256": "100aziv6wwrkalx07sy8za6kvnj30pknj1shbymspw13bpp7wqxj" + } + }, { "ename": "cycle-resize", "commit": "8806af6662c8250c7533f643fe1c277ff0466651", @@ -18560,8 +18603,8 @@ 20211111, 1407 ], - "commit": "8a59142db687b733b4ffe55c40fa03dc132122c6", - "sha256": "041zngk9ixp3ybpyca7klp0l37ylprfxq4lcydvnwlz7lgjgxff0" + "commit": "11a9e73a4e67b162b10d3db70b513b4d14bb7a43", + "sha256": "0dh67z7aq7jq8bjdi1k7j1c3sb2b9xm8p147qv4rlllfgfqxnmig" }, "stable": { "version": [ @@ -18768,8 +18811,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220216, - 1029 + 20220226, + 1848 ], "deps": [ "bui", @@ -18781,8 +18824,8 @@ "posframe", "s" ], - "commit": "8d110d4fa62c406aee836b352f5d5a3454e338b4", - "sha256": "0rpgfnlp1ixbam8iq2wxvmxbi8v6lhab2l3azm2294w2sr1r4qzg" + "commit": "6933fca0b53ea5d2d65a0545e5a4ae6424d32e9b", + "sha256": "1m99z72qmq4ghaiv5s9bqzx4aj1wj4r1d233h6a92hw7kdd9hj0l" }, "stable": { "version": [ @@ -19465,15 +19508,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220210, - 2155 + 20220227, + 1955 ], "deps": [ "ccc", "cdb" ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -19794,8 +19837,8 @@ "s", "wiki-summary" ], - "commit": "e19fcc96c94a161289f97a64275c016920587a53", - "sha256": "10c140n5g18v3rq14dzq9n2c3xa5ibzz2zkyiawkjfl664802170" + "commit": "70dd874c7cd8fef9de17984f1e360fe1d9f0d3e1", + "sha256": "0q1z1p4wmqaa0jdkw98brnvz7nz7nwgwpfcwa7ildjldl8k8xb06" }, "stable": { "version": [ @@ -20157,11 +20200,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220217, - 1624 + 20220226, + 925 ], - "commit": "783e9a6d4b0a36dfb646e3b9dad19c54018f7195", - "sha256": "19hlrz8vhabxgbdbqgkiav73wnfb33kb1nv53v8v0jvz9gh7a33j" + "commit": "cdc1a7cc3f05235883ffb098fe1c5a8963ed06e2", + "sha256": "1r84yimb8dc1i6ybc2vngvv38ypfnjwrbp93n13h9ij2p9dmxl8p" } }, { @@ -20287,15 +20330,15 @@ "repo": "martenlienen/dictcc.el", "unstable": { "version": [ - 20211007, - 1016 + 20220219, + 1302 ], "deps": [ "cl-lib", "ivy" ], - "commit": "235841b19567b9c2e17727901ca041a22c096512", - "sha256": "0lsqf199gxsgdldmizf7frn8ngbn3fjj81lc8lx30l3ib7d40493" + "commit": "8ecb954fcf193cba138191f8947c8b0b60a1c6c5", + "sha256": "1alpycrazpk2lgsgmqspxjcpirsppn8zcwa4znsh7rxb2v3y1ih6" }, "stable": { "version": [ @@ -20745,11 +20788,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20220217, - 1855 + 20220218, + 1541 ], - "commit": "672de7e1d022cb7da47a746ba508fe23f7bd6737", - "sha256": "0rnsq6cmffcygdkg2n8kn3sg1pddcl4ww93pwm7nx1iqf4afwxfb" + "commit": "8db04f40c269127919e1081c658f93bf7fe395f5", + "sha256": "1j6ym1bbld1bys5q5pm0rrx1m9922rr7fw82r2alvzrb78my660i" }, "stable": { "version": [ @@ -21791,11 +21834,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220214, - 1730 + 20220223, + 1713 ], - "commit": "55d0a5cbfcf2c4d14ce049eece102c48bdc774b2", - "sha256": "1cqjwmra0llmj7qn0661yi9aawy3snbjjzmmv3c70qs0nzgws19d" + "commit": "9bb39bef29a41162e00a563da4966b6a368e6b5f", + "sha256": "0wgyd66lrvl8i6sn7ar9mvm06lq6h57asm3sfhkiq0qf65w7bwhn" } }, { @@ -22474,8 +22517,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220216, - 1424 + 20220225, + 1528 ], "deps": [ "aio", @@ -22486,14 +22529,14 @@ "tablist", "transient" ], - "commit": "81f2b379af504428bf2c93a77c7aeb8e56a0f219", - "sha256": "0wyx77hyprw307r486q0x58navyzn7vbx1lsr8c94mb9ykq4icwq" + "commit": "498ffb2ba51fce12cb543caca0ecbc62782620d3", + "sha256": "1ixzi9lsjra01srvkd30jvryhbgxl9s49mspy2f6975zna390m60" }, "stable": { "version": [ 2, - 0, - 0 + 1, + 2 ], "deps": [ "aio", @@ -22504,8 +22547,8 @@ "tablist", "transient" ], - "commit": "9a232f563868786d7f50f0a99da2b552f5b83dc8", - "sha256": "18irvpwlbjczrcijs0zdidsmzzdi2kn9d56iqb8nn1qfgydshql6" + "commit": "78881bea51c74ef171788fa989908cd51f5b3f8d", + "sha256": "0wgdabjkcwi9a3615imny8xysbrydnlcz9rmkavp22kypk6ydcjw" } }, { @@ -22592,25 +22635,26 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20210729, - 508 + 20220219, + 420 ], "deps": [ "cl-lib" ], - "commit": "7bfbb55417e7d2aac53adf92cb0e3fd329c495c1", - "sha256": "078hqc8rqw27v5li8dgmh9sspfrypha6h7hx4iagjwndb2llg2ix" + "commit": "930d7b46c180d8a13240a028c1b40af84f2a3219", + "sha256": "05966l3af9lg4nlsz6wrq282ipwxh19ggirfyabjrr1syw3v2crn" }, "stable": { "version": [ 0, + 1, 1 ], "deps": [ "cl-lib" ], - "commit": "d8b510365d8e65551f4f792f251e7212411708c3", - "sha256": "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg" + "commit": "930d7b46c180d8a13240a028c1b40af84f2a3219", + "sha256": "05966l3af9lg4nlsz6wrq282ipwxh19ggirfyabjrr1syw3v2crn" } }, { @@ -22621,19 +22665,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20211016, - 1545 + 20220220, + 1439 ], - "commit": "5db94549ce8b000ae35adf511c820ad228178052", - "sha256": "1qldv6zcayj8sqjdl16g9rwxa0dzyja2r5d6v7kch9559vif1nyb" + "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", + "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" }, "stable": { "version": [ 1, - 5 + 6 ], - "commit": "628315e2e4ab2f269548126444234caa057b2c75", - "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" + "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", + "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" } }, { @@ -22688,8 +22732,8 @@ "deps": [ "s" ], - "commit": "3d350b221bca9f9f1a0b2168158c471bcf5ee9ac", - "sha256": "0ygnkaqlqc82mkf2hxhrqz7hn0nmbwc0nwh4p0mwc5wfy3v6lcs6" + "commit": "49d0e77aa9a1c6a649c0d45030111b26222f960c", + "sha256": "0w1jjm9p2332ql8k32x2i1f51df8wqz68y07dqipz5d3h4ysgwfl" }, "stable": { "version": [ @@ -22712,11 +22756,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220209, - 646 + 20220227, + 205 ], - "commit": "ce21bce19b91e6f1dfc1f23983b4b8ce4464c8f5", - "sha256": "0gdxg9r4nxp856vgp764cf3w81awbc6rczym27xlxzp1m7s6rfyy" + "commit": "4033a8fd8681d3989550f7a2532d6b4e3c45bfe8", + "sha256": "1vfwxjn86rprfz3cfc6w6hw5lqnbh093kydv0lapgz508f5yjazg" } }, { @@ -22849,16 +22893,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220207, - 911 + 20220218, + 1547 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "30d15b121f58a26f503e3bb63aa5d74445114493", - "sha256": "0c5q4laawx6r99qabys40dwnqax5xiry9hi1d158bcl6kndyhz1n" + "commit": "d9b64bc56283c7816f8124dcb3a5c7ea22732643", + "sha256": "0kk0yxcb26igkgqasrp9h78k0sll9by9m07dydd7lhkpwdg4dd7r" }, "stable": { "version": [ @@ -22902,14 +22946,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220216, - 1451 + 20220222, + 2326 ], "deps": [ "cl-lib" ], - "commit": "9253497b6b1f86ea682313744b3eceb629918508", - "sha256": "14vbj663v7zsahs94nfkxfg15iw6d7b2577cv4vyfqxv9q29rwg4" + "commit": "83fd9545c2823b4b2610947802fa3a52995517b4", + "sha256": "0jrmmdz7s6jlq7h6dpxfgx1wvvzwam3rq5dgsqqcn383d9i7zbmb" }, "stable": { "version": [ @@ -23454,19 +23498,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220111, - 1234 + 20220226, + 1354 ], - "commit": "926fc4260c3f71f5aac2e0becb9ee435a4124d5d", - "sha256": "1jq59zac8jwdkp5lc01ygi7f5wlx4bnzkmrsa4j57w0xn70lbkjv" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "226581d667f11d69474aa4df3ce90f7ec69fe439", - "sha256": "1kad2inc9k2z65if26vfiw098yklzxdx9fw8a6yicb87jgc1cz36" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" } }, { @@ -23588,17 +23632,17 @@ 20210909, 1010 ], - "commit": "32ef2d50be4e1f9f16f3cb2d9727be0c24920ec4", - "sha256": "0pc41hqzaw23gfxlhp2ar2ixha7vd4vizv13bk71mv5gx6bqlprq" + "commit": "c967d8a4880732f2f7cba39d4f283154c5ef914e", + "sha256": "079xxy2569zrfy2r621bb25gw99dlmwmys60qyrxvn01mb9ah9ql" }, "stable": { "version": [ 3, 0, - 1 + 2 ], - "commit": "b6709437aa1b264826735963e0d7c199c4ddf82e", - "sha256": "1vaxxczna6lbpzh6w1sj4pg06as2354labl7m725d02wmwq3vdpd" + "commit": "f8c75a43bc0a8e190727161c2f67ae643b884542", + "sha256": "1spgn3sjygnwq95ybxaj5dg9s5hyp6v5dwl240w3m4664blilz4z" } }, { @@ -24405,6 +24449,21 @@ "sha256": "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30" } }, + { + "ename": "echo-bar", + "commit": "86a702ef21febcfc227c1f2b64a7e795403a81c6", + "sha256": "1zi6qnqmbscl36iafblhshz5hrm5z1phzzb6swz1ryw23808skyr", + "fetcher": "github", + "repo": "qaiviq/echo-bar.el", + "unstable": { + "version": [ + 20220222, + 214 + ], + "commit": "06cc8ef88f3b054f676b76815879bd6c71107591", + "sha256": "00cipip1zlfag1mrqi887qq2a3zf4n39a0z5h3vsv38zslq1rz7x" + } + }, { "ename": "eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", @@ -24675,6 +24734,24 @@ "sha256": "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2" } }, + { + "ename": "edit-as-format", + "commit": "1ae1d2ce5a4a6949af6b728bc112fde1be63d1b6", + "sha256": "1fppb6cpa2kbbk9warijkcij1ld5yirh7g2i338b71qppyaps4yr", + "fetcher": "github", + "repo": "etern/edit-as-format", + "unstable": { + "version": [ + 20220221, + 1312 + ], + "deps": [ + "edit-indirect" + ], + "commit": "59c6f439683846d994a7a2110b9b00cc16c08c40", + "sha256": "0r2whzb3pizagbhr7i03kjiplnfwr1x14bl9y1gdvp166vfif5x7" + } + }, { "ename": "edit-at-point", "commit": "2c01af1911a0c8856e3dee09b6d233f821d67814", @@ -24804,8 +24881,8 @@ 20181016, 1125 ], - "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", - "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" + "commit": "65a8e434547dcbe1df89dc3fd7aee075f8b06366", + "sha256": "0krf7n01wq2230qla3dn8jb1l9vmwhd5vvwjnn6xr889c9d4wyjc" }, "stable": { "version": [ @@ -24990,11 +25067,11 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20201122, - 25 + 20220226, + 1619 ], - "commit": "537e2e165984b53b45cf760ea9e4b86794b8a09d", - "sha256": "07cnp40rbl2p4mn40cib6mvby1svxqd8kb3dxb3a8idb736nzqrp" + "commit": "bf588399e241742962613ce2a96f0cffc86417f6", + "sha256": "0y0rxiqa1vxz4ylhagr9mnh1x4lghg1md3k1pqzciq9gnqgl3fpn" } }, { @@ -25005,8 +25082,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20210630, - 1626 + 20220220, + 1753 ], "deps": [ "auto-complete", @@ -25017,8 +25094,8 @@ "popup", "s" ], - "commit": "5564f5292eba339afa7760af9467c896ccd708da", - "sha256": "0dkpijsfprlckaggnzmarrbny2qn02927s0fh94dql2gqkvfxhd0" + "commit": "603e182f8f0a4140e6cbf71c2d73673cd08028ee", + "sha256": "0zvbahgm910sdasq1404lyxxan0mrcpzcjwm64jpzinx2i0bai5j" } }, { @@ -25224,8 +25301,8 @@ "seq", "xref" ], - "commit": "0f352213fcfa9f9e8406771fbc8629f2885e80ee", - "sha256": "0ly76fddl2r8hrhqm5jlpsmj5nvggdxl5mxqvb9f6jv82p0bvxbn" + "commit": "bd6a1cccfe9c0f724772f846d1f4a9300f40f88f", + "sha256": "094kk4xprnfx3x94ij3fxc6sh877m03dwx35qmg1sh8capx28zi3" }, "stable": { "version": [ @@ -25979,20 +26056,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220213, - 1633 + 20220221, + 2055 ], - "commit": "0d65a3f022e4cf2dec0b6aa313625b060e41ddb8", - "sha256": "121va329mjh8nv4q4jy0sfs026f8zfgmmfz2lm439amcl5b4hazj" + "commit": "7be0cb16ce5d9d3139b4ed1724ac6d8292935267", + "sha256": "0yb8rpv6yi47kdk6gaav063zqq3l4jlyb4wk95abwzkgjcmjc4ky" }, "stable": { "version": [ 0, - 10, - 3 + 11 ], - "commit": "f111d19cda305e5e8fcb70a5675b87173041cb68", - "sha256": "1y8vz5grmlhln37lf93a3gxwh46ar0v3jj2dcvzkb36lqf1snq73" + "commit": "f7cfdb8648624917afec0a687c6fa92ce8d7958f", + "sha256": "10l9gdxk6l2zp14zaf6k5aq36c0nbjq8jya727xs4yra0rdg05hl" } }, { @@ -26003,11 +26079,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220216, - 2221 + 20220220, + 2003 ], - "commit": "3efb59ab784a704f075e4925ecadb1999c950440", - "sha256": "0fzz8wpnqf5b4kafm4a7r6x4dnczf48jxqmxgbs14wh2wrxazr82" + "commit": "646ae5cdd8ccbf5d78eb0488298b7c5e9c9a18a6", + "sha256": "0y2502b0d0fy2pm7kklv5262maxky2y2y8nw223f4f3bicbymxwy" }, "stable": { "version": [ @@ -26167,14 +26243,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20211114, - 1153 + 20220218, + 826 ], "deps": [ "dash" ], - "commit": "1c51e88d5719e7b0dd022a4704c46b24e0c91348", - "sha256": "1zzy3y5vkdlb7wb3b4fgvm61zn3dj9n0ldi3153qvrgwn6w8m648" + "commit": "6dbd8f80aee44e2f6ff9995f1bebb8f05575505a", + "sha256": "0a65cin6r2bx9fz3a56iywmsdm5k6i6av0j6ba3s8hm2hdl7ckdq" }, "stable": { "version": [ @@ -26198,11 +26274,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20211025, - 1016 + 20220220, + 1540 ], - "commit": "859f4ab05eff9b00b3fd460b69010a03e010130e", - "sha256": "1s10sn14386dgjxkb7y6mlf5amcb5pq5p3akr0xjdh0dkdwy3db0" + "commit": "c37b2502512dd49a8311d7c34e9bfd1af3d4dbcd", + "sha256": "04p7bxlm82c7f28sskr044p1vyyffa3wir75b430d82by53b6yrj" } }, { @@ -26650,14 +26726,14 @@ "repo": "mtekman/elisp-depmap.el", "unstable": { "version": [ - 20200714, - 1630 + 20220223, + 1131 ], "deps": [ "dash" ], - "commit": "98676e6ffcc4efb70cc991e659c79cb599b01bc7", - "sha256": "0ybqbyv1jnjk25z6ys90d5lddd4qxqspn2xppkzvby21x634s2ry" + "commit": "15909462e3f7daf445d3cecf402ee16c7e3263ed", + "sha256": "0l08xy83b3avjjaydys7f25rr0l4ifh6awl8dyy6ww6wvrz7sd4c" } }, { @@ -26730,15 +26806,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20220128, - 1736 + 20220220, + 2305 ], "deps": [ "dash", "s" ], - "commit": "fa1de199e07fb020b776fb585613682901962ed6", - "sha256": "0nw1h9iif0amak4wx985vqfv2a45yla2bhi3bb8bjlsxaixzh46a" + "commit": "8f84280997d8b233d66fb9958a34b46078c58b03", + "sha256": "026nvkbyacdxdgn5c4c09r7hpwypcimqjvx9vx07klaw6m6s25ba" }, "stable": { "version": [ @@ -26881,17 +26957,17 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210525, - 152 + 20220227, + 931 ], "deps": [ - "dash", "f", "reformatter", - "s" + "s", + "seq" ], - "commit": "f2e2d0053f3272d9fc0c2e16c8d17d97724cf524", - "sha256": "1gaddxw63d5fna43d7kc3px9sbd2knbjga0lx2zz0lsbcjr54pzr" + "commit": "d4e434fa1857ba2f58d27c7520ebeac0515cd140", + "sha256": "0vqqi7g2xwsldmgffi1ygfv87qar6xyqk9r2j23hpyqjh9pzcvx5" }, "stable": { "version": [ @@ -27237,8 +27313,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220203, - 108 + 20220220, + 2059 ], "deps": [ "company", @@ -27247,8 +27323,8 @@ "s", "yasnippet" ], - "commit": "9b458c80dc1bcecb6345e157d8e921c1e4e8a7ea", - "sha256": "1dniwj4lbmmwk715gi8kykp3c953migh0bs1br3vk1w2n8d6lax4" + "commit": "758c1ab3516b1e38fdc5b978da6252284f4ecade", + "sha256": "0mldrhqppm3cqrdl836g3rzd6l29ynjvz4b747n0z86sj1chgn54" }, "stable": { "version": [ @@ -27312,8 +27388,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20220208, - 17 + 20220223, + 2021 ], "deps": [ "cl-lib", @@ -27322,8 +27398,8 @@ "seq", "trinary" ], - "commit": "82ffb6eecefde7e99383e4a657f17fe414287846", - "sha256": "1aya2cavpvagkhhrxzvs3d4qgddfjxl097d571xp3gzi3cn7k35r" + "commit": "21ed4f46e2d02ffb48b3ae377b0c93732ccf3f4f", + "sha256": "0pfwi4xddxphanh83xzvbj3a04wv7x55xjs796i1h820hm7zhidq" } }, { @@ -27575,11 +27651,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220209, - 1510 + 20220220, + 1404 ], - "commit": "634924587be831bcb3ca47e97c104216516f9ca9", - "sha256": "0mmd5lr424mn76yrk61cjmzwi6q0ilji209jnc36lclrdyyx3r06" + "commit": "f23230e67c45536501d651ef6b93546b4ac9fe4f", + "sha256": "0x9kfrcf59l0ql9b71a4hbgxjl9lb5w0fwydxcyz5ib0yk5nca55" } }, { @@ -27632,8 +27708,8 @@ 20220101, 1820 ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27693,8 +27769,8 @@ "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27723,8 +27799,8 @@ "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27747,14 +27823,14 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20220101, - 1820 + 20220218, + 1543 ], "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27903,11 +27979,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220216, - 2111 + 20220225, + 2232 ], - "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", - "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -27926,15 +28002,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220115, - 1540 + 20220219, + 1728 ], "deps": [ "consult", "embark" ], - "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", - "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -28082,28 +28158,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220131, - 501 + 20220221, + 1445 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "d32a9bbc8ffcd736c4aa33a6dcea819a01b8e808", - "sha256": "1bsdwp4h5b3xbigaaa8mx3sx9650xn34b1w4l47r8a4c5imkxspi" + "commit": "6afe1b26d679357586380ecd69c9795985231013", + "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" }, "stable": { "version": [ - 9 + 10 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c3596ae7166db2de004c57da303b5eb8d3e1f2e8", - "sha256": "09fs05cgvxxsqcbswrdr5fi8g0m0y2iq2w19ks7a102zqpfp2bml" + "commit": "6afe1b26d679357586380ecd69c9795985231013", + "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" } }, { @@ -28374,8 +28450,8 @@ "emojify", "request" ], - "commit": "d842353ccffc1469693edd4daffcdbdbc7db4683", - "sha256": "0p6pndcy9knc37fq4i8rw9czvkq3zmj4m23dck2zb7yckmsrlkr1" + "commit": "c641508772a7a7d455f0917d45c3c508de56e871", + "sha256": "0iam1caa6pyr3x7qf5nl9d2c0js9m5k6q59dbmvq2bwm7l243nxl" }, "stable": { "version": [ @@ -28687,15 +28763,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20220130, - 1525 + 20220218, + 1627 ], "deps": [ "inheritenv", "seq" ], - "commit": "12485e71d5154b02858628fce84396ac03f95630", - "sha256": "0vpwzs6yz6cmqcawil42wxdljkncnx85snk1p9pdfk3aghrrws4x" + "commit": "57d78f0138d9c676dff182e713249ad055ccf85d", + "sha256": "12bs9ywyf30qrmhibbdvcf5i24mvq8l2j3y0fv32fb2ydk4lpcmw" }, "stable": { "version": [ @@ -29446,28 +29522,27 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20220104, - 2107 + 20220223, + 1148 ], "deps": [ "cl-lib" ], - "commit": "b0ede648b660cc7fe2b15abf6d85cf59ab01bc96", - "sha256": "0hhrd3fllmvjpl3kj96sv9k9qn2cb4wy74gz2czy712xj5bh0y4w" + "commit": "757475874a840f99b20c56182c7199257b6ae477", + "sha256": "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr" }, "stable": { "version": [ 5, - 16, - 10, - 12 + 22, + 2, + 23 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "ac70b2563fb6e3d69ea382fddc87b5721c20c292", - "sha256": "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi" + "commit": "757475874a840f99b20c56182c7199257b6ae477", + "sha256": "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr" } }, { @@ -29500,8 +29575,8 @@ 20200914, 644 ], - "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", - "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" + "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", + "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" }, "stable": { "version": [ @@ -29525,8 +29600,8 @@ 20220215, 1844 ], - "commit": "4bf7ba5a9cd496e974df10ef927a7c7c65ab96c9", - "sha256": "0gfbssvl2hg53w36pi86dlg9kglnzi69irs906salhbg7cgh1wfh" + "commit": "d469db4ddf72479a42b60f5337504fb53b65079e", + "sha256": "1mp8c7hfrdbxp6h51fkqi3ri3fqxwapgp9qbggw1jfpqlsjga8lm" }, "stable": { "version": [ @@ -30250,8 +30325,8 @@ 20211005, 221 ], - "commit": "636bf8d8797bdd58f1b543c9d3f4910e3ce879ab", - "sha256": "02hjm685fl4f33s5fi8nc088wwfzhyy6abx5g4i93b2dx3hr2lyi" + "commit": "0435d8e2864bb4f1be59ae548d0068c69fa31c7a", + "sha256": "1ggp122b0a93ji2khxg8kvklwvjxx4a45hayln725d5nsmf82wy6" }, "stable": { "version": [ @@ -30436,11 +30511,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220213, - 1912 + 20220225, + 1523 ], - "commit": "399f952c4bc1cbe17ce46b6800fc469ed0c6a25e", - "sha256": "01qwcjj90zdgz061nsqxralv9z6l20k0sahznhling9xnalymfjr" + "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c", + "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06" }, "stable": { "version": [ @@ -31183,15 +31258,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20211125, - 2021 + 20220222, + 1856 ], "deps": [ "evil", "evil-snipe" ], - "commit": "ddea4486de929c399745713a6e616df50b22dedd", - "sha256": "1ld9iv6ysk28ps6gx6jgrqyazyqk1xd17a4fhf94m2hy7jzakwaj" + "commit": "66648de206a7368013f28c0d053b1b32c3efe6c6", + "sha256": "1h9d9jicvc8kdw8yfpsasl038h7s6zpfh1gjfcxn3lwgfmfnjkh1" }, "stable": { "version": [ @@ -31233,15 +31308,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220216, - 1857 + 20220222, + 1104 ], "deps": [ "annalist", "evil" ], - "commit": "081a9f423e95d57fa3c10dee18fa148df5ed198f", - "sha256": "1m36lsqrfcj8w8cdcckvyz3q7i089akkjb4c9wga9iz09pgpjw4y" + "commit": "2dc6b5e56a7c320dba9da1da2c8c491be586eecf", + "sha256": "12rnxyzqna28f9mxw4fhw4wy0lilp5vjfmdvbaz3sldc162vi36q" }, "stable": { "version": [ @@ -31581,27 +31656,27 @@ "repo": "syl20bnr/evil-iedit-state", "unstable": { "version": [ - 20200830, - 617 + 20220219, + 1432 ], "deps": [ "evil", "iedit" ], - "commit": "30fcfa96ceebed0191337c493f5c2efc8ae090ad", - "sha256": "0aqwjd7pmzxf7l768vyqqgjzmqdwlpznh30w5bdr7yh79r6xm6n1" + "commit": "6f7b502447ba35676375169d7707372ebad2791f", + "sha256": "0vjzjmp3ba0nzf0v04bhxvzgdwwm11vivxqjzgnvp3kq95kajr5h" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "evil", "iedit" ], - "commit": "f5573ddefc03309037bd98c4c649d517f4f8d659", - "sha256": "1i4kq34kghabkx0mp0asw2d0ybrrlv2ps50h8mgkm20sm5ha9lbh" + "commit": "44c64c71692e5b2f608ad3e3c537ec0a0e0ea0f8", + "sha256": "0kka4g4rkvxldif39n617llr95q9aaijchhbci85cj3qqp9sd9wb" } }, { @@ -32031,14 +32106,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20211117, - 2046 + 20220227, + 1024 ], "deps": [ "evil" ], - "commit": "26ad08b5f629370f57690315102140878891ef61", - "sha256": "0i36pc7kb5ysk8hm1ll6dq5y6xpl19nm3ap64gzi3b3p94wn6jl0" + "commit": "0d10ff7bb9a3a93d25cd91018b17f0a052b335f3", + "sha256": "15g47xgpswzc8lz7qdbbzfcq1n9m4474qa2jkg43l8d5ali8qa7z" }, "stable": { "version": [ @@ -33954,11 +34029,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220208, - 49 + 20220219, + 1818 ], - "commit": "e6dc6d4397d70318c8e5acdd86b9b31b25102182", - "sha256": "0iayhg58yxcxwjywfr024df03y1ifj2y9gshvnndrjjc4jkm6zn1" + "commit": "f32c32711e936ae0397686b38b88a7dd3cc7ad21", + "sha256": "0vkd83bjprwbm02chvm1q8m818f9ngpbdzr078bxbyig5p0332z4" }, "stable": { "version": [ @@ -34085,14 +34160,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211211, - 201 + 20220222, + 1101 ], "deps": [ "s" ], - "commit": "c328cdd1c5a0e734937125771279838e401fc5a8", - "sha256": "0kz6mv7awammgsi68vg6addkqry86sd3l8qrk3djwb77kw6rpvn6" + "commit": "bf214d3256143c4d18f3ec6060ee141d252424e2", + "sha256": "0wfp54h3wfvvr6sms1fzxpiqdsyhyygnmjkb9jv03gkir3asnpf9" } }, { @@ -34500,8 +34575,8 @@ "f", "s" ], - "commit": "d4f91ea2bbf0508be05212e00f9a6675aa62e04a", - "sha256": "14i6wi5shd1hzh271hl5bd39jr5xvfkirasz67apcsdpfavzvvry" + "commit": "bc8828273e7a01549d6e892bb0f4ca36d59dd964", + "sha256": "0rcxlmic4hh6qc2l041i7p3qxlmncbw8bhh4lzgg59hdhc18ln04" }, "stable": { "version": [ @@ -34674,8 +34749,8 @@ 20210707, 354 ], - "commit": "55b15274aebe013bfb68c9ca5a53c65c21554eae", - "sha256": "1ycgs27n2a4ba38bww1wsg6aa6zab4yzwfnl9hm658kfr5w2i6jc" + "commit": "f23ecfc9c6b7a1369f8431ba1bd919a733b3d38e", + "sha256": "0hp3id5fc8z305y5jpbg57nqzdscw5r9yhvmzndiw6ly9pk8868a" }, "stable": { "version": [ @@ -35684,11 +35759,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220213, - 1334 + 20220220, + 1423 ], - "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", - "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" + "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", + "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" } }, { @@ -35706,8 +35781,8 @@ "flutter", "flycheck" ], - "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", - "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" + "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", + "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" } }, { @@ -35996,26 +36071,26 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20201120, - 2307 + 20220221, + 1029 ], "deps": [ "flycheck" ], - "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" }, "stable": { "version": [ 1, 0, - 0 + 2 ], "deps": [ "flycheck" ], - "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" } }, { @@ -36814,16 +36889,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20211231, - 914 + 20220222, + 638 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "32ef7144c8a0dd708d57f8efbd54ccf7b29d76ea", - "sha256": "1d5dgflz33sjwx4yzj9xcph2wl4vf4dm82jx9qbkk4ii2q4f185w" + "commit": "7ded0a4f36b88867ec6b14a791dc4d14baf09bd5", + "sha256": "0q3bhfjb0cr4f0g9dyyz70lgzzzwa3k77ahyhkc1jscmjafsjs5i" }, "stable": { "version": [ @@ -37248,8 +37323,8 @@ "deps": [ "flycheck" ], - "commit": "24db2496b5320614534f38d5cfc71f43b00155ff", - "sha256": "0fy17nj03glvaz1d2m3i8sqf4szmrjwdvqlqkg8r31x6ac0gl0d5" + "commit": "c22c4f33cfc1229177fc67b18885363fb8a23af9", + "sha256": "01nshsqjl9vlx06vg2fws0jxd6x2dy5pf2hix0am14v0rk9kh6zk" }, "stable": { "version": [ @@ -38330,8 +38405,8 @@ "flycheck", "vdm-mode" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -38757,15 +38832,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20211231, - 914 + 20220222, + 638 ], "deps": [ "grammarly", "s" ], - "commit": "7e5aaaec5cc5e0a217c8d83f857b5a3415f5865e", - "sha256": "06mgnh013633i6ij1664zwsmd35hbn4a16i25ang78cmwpb5bzy4" + "commit": "ae2190f47b8e0792ae936f972081de5a5b796d95", + "sha256": "1k66jv6nqmaazibr212swhkn4y3dkzwrg7f9mvpig19abfima6yn" }, "stable": { "version": [ @@ -39011,8 +39086,8 @@ "deps": [ "s" ], - "commit": "107fd8231d130bc63f1d4cdcca3622e8c667f22e", - "sha256": "0vdp9dlszm916filgda28j3pfqi07b1fsmwcw8d1kxj1k6j8b1j4" + "commit": "55df906e4a19d64aa6bc44fd45eb02819c6e77be", + "sha256": "0lxfzib1ipr3nkyjixy49n7g5z1v6hhimp1ff6n87wwz1d55lkjb" }, "stable": { "version": [ @@ -40139,8 +40214,8 @@ 20191004, 1850 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -40217,8 +40292,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220216, - 2157 + 20220225, + 1417 ], "deps": [ "closql", @@ -40231,8 +40306,8 @@ "transient", "yaml" ], - "commit": "55632815463f9d2d259dcccd22bfed224b5081c5", - "sha256": "0d26v84mcc77vdvh1ks9gkbwr5f0wvmhbkgqz4qkjy9xdpnh1s3x" + "commit": "0f436173d1660321edac761e3e82c40e97709f63", + "sha256": "03iwng2l5gj3mhk8jw72wzz5iji4c0m5p59f2igbiqm79xrxghys" }, "stable": { "version": [ @@ -40432,14 +40507,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211223, - 405 + 20220223, + 1041 ], "deps": [ "seq" ], - "commit": "0aab300c0a6225d93087ae112f123eb89048ce1d", - "sha256": "102g7n43ji47ssj7rdyx34frbgl84lgmppww4f3x6wbkvfwa2p6f" + "commit": "96dd298a2ee2f62739e4a11281daadd90352df70", + "sha256": "0amxqi4jvc0sr5i6pk72ricjwdc0v0lr0q34vccsab2l8iiwid89" }, "stable": { "version": [ @@ -41056,8 +41131,8 @@ "deps": [ "cl-lib" ], - "commit": "b0f39e3617f5adf8ac9ecdbdaa6b0ee997cab020", - "sha256": "06l5yk7hpfys0252yhqzfa9x2x8883yw4rsmhavvcn5w0l1n2m1p" + "commit": "3032408bd3b521d761eea9f0e4e89640d5485129", + "sha256": "0y6mralgvay2493vzm6m7m53sxivg9rzhs947flpdyz8xsl0ac4d" }, "stable": { "version": [ @@ -41656,14 +41731,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220203, - 2107 + 20220223, + 1659 ], "deps": [ "transient" ], - "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d", - "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v" + "commit": "ed6d6a1b362fe389acb7f7e1bf6d89ff88e060af", + "sha256": "1zs3ywy81754daygch6nc03wg5z953gm03kclnv5fngxjzjf5xgk" }, "stable": { "version": [ @@ -42814,15 +42889,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220130, - 2254 + 20220222, + 1036 ], "deps": [ "transient", "with-editor" ], - "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", - "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -43106,20 +43181,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220206, - 1802 + 20220217, + 2315 ], - "commit": "a715c116341162ff1a49fff684a45dec8ac0b0af", - "sha256": "18y1c0nfvc6sr2f4kfddq78kbivlf38zn35pzdvnmfm9nc42dc6m" + "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", + "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" }, "stable": { "version": [ 0, 8, - 5 + 6 ], - "commit": "0f22d081184bb4040416296099dbf3a8eafb2437", - "sha256": "0payj5hwqkzdrxx5vfzaaalmzfkdmdqhqki193a6cbf0k3c03zh3" + "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", + "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" } }, { @@ -45161,11 +45236,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20211031, - 1513 + 20220222, + 1514 ], - "commit": "3e48a56356991b3ff5228eced19b07862835cdcd", - "sha256": "0mkbra0a14rxh0716m6zxlkx05rhq1fn6n3yry29wwiabxa3w8ab" + "commit": "5d10b00b5f4ee686683c48804235f62d644ae2ef", + "sha256": "0q7vnvqr9283wg0gj7cwn8b540syhzyibjkhv3h81qi3cwk5a5fy" }, "stable": { "version": [ @@ -45573,8 +45648,8 @@ 20210323, 332 ], - "commit": "f06dbba4cc352d6477cfd500217cba0d26223ff4", - "sha256": "03iajajpxnadsp78rgkanghrr2jm53an3vswm2vn3saqfksps899" + "commit": "5da95c2b6d555155189c54b6857ceaafa2b72e8a", + "sha256": "07hapzb7h2rbvxzn1ml4dmzcj1ihdcsw365nirvhjfbipr1y7xkn" }, "stable": { "version": [ @@ -45660,8 +45735,8 @@ 20210323, 422 ], - "commit": "e8e996cfebe2f1a35ba194d6b3989d11f3ae62f1", - "sha256": "1zvfzhn63ylpmnf4kyx6pahrarfnkmyjxvridb0w9g7lmrc5adh8" + "commit": "921f7b729fff82924c539d96feb47e299c07e7a1", + "sha256": "1v73qzgf1bfkw7j295nmlpqaims8ry5b0vszfxajz2p09011hw12" }, "stable": { "version": [ @@ -45690,8 +45765,8 @@ "magit-popup", "s" ], - "commit": "81c26b4b6522eca2af3ec9f35df669cb2d51f9fb", - "sha256": "12xhndnxx8zckmq23z3cvvlq5jrmqlfi7nlvsxns10rxsbmgl2ps" + "commit": "a41644562f5977dc76f2a385ab77432bfc21c993", + "sha256": "16q09nrsxnwyylfk0zdk0smxqwr31n13hww1i4f5gpw232b5lbck" }, "stable": { "version": [ @@ -45917,16 +45992,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20211231, - 919 + 20220222, + 638 ], "deps": [ "request", "s", "websocket" ], - "commit": "5cff7dc36575c9198d911448034649cd769b6b56", - "sha256": "12jm1p881dqiqdbhdqfy8r6kdf47b8ar8ldif53366hhl0pf5hyj" + "commit": "b340f523caa88534a89f5fa9fd0fae502e56a12c", + "sha256": "0f8nr981n7ndc7zvj21hsfqiy4h1ry5r1vz004lggphb2lzpzgyn" }, "stable": { "version": [ @@ -46338,8 +46413,8 @@ 20220104, 1419 ], - "commit": "9220a560b4ac8431067be9c25a4c7f19075dc525", - "sha256": "0vq5nj4a6v7736lif992c3pdrpflp6p3y4x9l96qhi5fvbga7pfz" + "commit": "1fd737f7f1e34e27b6d317ba16507bbbe0d2588c", + "sha256": "1b1cams272ppzs00gbcmaxihgsjym96qp399hardiw7j8byav7fz" }, "stable": { "version": [ @@ -47306,14 +47381,14 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20220131, - 1558 + 20220220, + 839 ], "deps": [ "f" ], - "commit": "9bbca44630cd23dda8595e13f8d3cc9af28c85db", - "sha256": "1a6mlga3k2816gi7s0lmjdbbflinpbcg3pzpx1zr1aknxi8ciw91" + "commit": "2e252559667ebe27485aa990a5ec062f94b67835", + "sha256": "0s2ags1ashr1mk5g5x467xh0ffxzkmyhr9w86qgmjnq37r0iw5zi" } }, { @@ -47752,15 +47827,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220217, - 1752 + 20220226, + 2016 ], "deps": [ "helm-core", "popup" ], - "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", - "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" + "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", + "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" }, "stable": { "version": [ @@ -48665,8 +48740,8 @@ "deps": [ "async" ], - "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", - "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" + "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", + "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" }, "stable": { "version": [ @@ -49223,8 +49298,8 @@ "deps": [ "helm" ], - "commit": "73312c3d092db8fa401b2e2daa410c452b4e156a", - "sha256": "07aj2izjvjqvi8c7x9n9205vxza4rspw1c7c88ccaq859xz3fx1r" + "commit": "2eb2ad4f3f456fadfb6a0ec044acfef2f2e7af5c", + "sha256": "0z0ssmi8l6x2fca7xfnpkyvfmyc4zgbf925ms3bvgjzwm5q23zmk" }, "stable": { "version": [ @@ -49488,8 +49563,8 @@ "flx", "helm" ], - "commit": "983acd152bfb636a168e81e138f82a25c95385a5", - "sha256": "15kbil5bj8kyn6q0vaacc8prqacjihkw80mb7h8bg8yrjy3ls1j0" + "commit": "6cbdb15094354262a2f5f793b66694e3f2c86e0b", + "sha256": "1gdjczi601586f7qzdxs65vhi9im6zymmqqp02ayz0nbmkijvqxj" }, "stable": { "version": [ @@ -51660,8 +51735,8 @@ "s", "searcher" ], - "commit": "238b36b0c9c969e322f2ebd1cb0aabecf7076123", - "sha256": "1k2i85qscbpqpd9s799q8n3jdw9f33am2m7419v6cwkymn28qv32" + "commit": "40f0db0a94ad45fe1bdb8928a884784a5adb2bd8", + "sha256": "0kprf6c06bghs4iw4y5w8ar8l2zg2511qdc46h6dpsglrp6d79pa" }, "stable": { "version": [ @@ -52524,8 +52599,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20211226, - 1843 + 20220220, + 2308 ], "deps": [ "dash", @@ -52533,8 +52608,8 @@ "f", "s" ], - "commit": "f865f17ad04cd270685187b0a5331ec8eb06e541", - "sha256": "1vxjf2mgnnh0dkk727nm7gw4fajizl6c52y27bi6rs0ahhy4ybib" + "commit": "67cdd1030b3022d3dc4da2297f55349da57cde01", + "sha256": "064rnxcf1w7zrjr39a72hngyndj24wkmmyqrgr1bpgsl87zgvbrg" }, "stable": { "version": [ @@ -53249,8 +53324,8 @@ "deps": [ "cl-lib" ], - "commit": "e146d672ea4c00fe17018e7e76e49d59570eeb2b", - "sha256": "0bcrlw76nihbffm7p5jh9vf3r1756p6vwa7hbwp933r4caaiyqid" + "commit": "f7e7b12fd119e91c795cbe21bebf7b5af5d273b8", + "sha256": "1jdzd6r3x4dc03256y06dp747h2wp7hcm5jkb4n9ima8z2h3v3ck" }, "stable": { "version": [ @@ -53907,8 +53982,8 @@ "deps": [ "dash" ], - "commit": "2b826735bb8d3bcfced489a1e0fa21b10fbc967e", - "sha256": "1ihpwl8rlpxmalpccnkd3xk6ngd4gxz29gjyyhka7p825as5nywm" + "commit": "4ca0638a14a8b304ac2b46e7b342b8d8732ad199", + "sha256": "1d0wi5dm3qri9b502nrbcra3b3gmikbqdbyzk87fccb4gf9k500v" }, "stable": { "version": [ @@ -54148,8 +54223,8 @@ 20200929, 559 ], - "commit": "b10c95db3347f21aca02d117fe036dbf036ec6ef", - "sha256": "1x015d5qzc88vh361hf6bzyzcclypq50iakg7jzw2lw4m9vmg0r2" + "commit": "4dc29dcae47afa740f001f04ad7f7b77169ea8a6", + "sha256": "1sfbd0a6lgipcd1i8a843433pwf8rfspim13qx0lwghwzva0f7bl" }, "stable": { "version": [ @@ -54549,14 +54624,14 @@ "repo": "maxking/hyperkitty.el", "unstable": { "version": [ - 20200927, - 106 + 20220226, + 1951 ], "deps": [ "request" ], - "commit": "ad65766fee2675bf123491544707b056b89b52ce", - "sha256": "1h819sxbzpcnr6mkl6aw9qxhyhkydppwwwqsgyw9qfil9sk8hyff" + "commit": "2c1d22ff017d096c359aa151e6a29f7214a58118", + "sha256": "1ymrzy0l6r6kvrf6p6xwb8dlg4gj8h14xam56d94fbh6mhr53z50" }, "stable": { "version": [ @@ -56004,8 +56079,8 @@ "deps": [ "impatient-mode" ], - "commit": "4fad373753f2169064c54e9a653ee182fb4c648a", - "sha256": "01lz8b4n5k35p5q7335bfdjxn5qxcp6p2ldz31y4ajckwq89ihnz" + "commit": "38ece99b3d566c48d9ba011a234869bc1b6f9a1e", + "sha256": "1za9rsf77f1qv2pqhw5myih8lgpdsa8n61pzj5z4lk5isj10cykw" }, "stable": { "version": [ @@ -56142,11 +56217,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210508, - 309 + 20220227, + 653 ], - "commit": "6fb3e291fb151208cebdd6686f71d60e47948702", - "sha256": "00mr0lhgi4gky5ddqqw56yqcbch9xlm62ciz4r17n32mii6ys25d" + "commit": "73682aac9aff60937a5f0187b1896c8f78f1b9cc", + "sha256": "195mpasf89jwr35q3gbcq286hx2siv9asyki4bz5wx175yp3yjjk" }, "stable": { "version": [ @@ -56731,11 +56806,11 @@ "repo": "zonuexe/init-open-recentf.el", "unstable": { "version": [ - 20210528, - 1902 + 20220220, + 2004 ], - "commit": "c019ea85a9c589815b0af60153858d09bcef130e", - "sha256": "12jwz0ssfxz1z55fb7v978xz8pwnclnqnzq5pqggzb06zkfxx7iv" + "commit": "51463effe54ca9390ec339b9678968f35a40dbfd", + "sha256": "1f1y3wafix0xvffkckbx3yh1sf548xvk6v3lshy859nbcbm4nbha" }, "stable": { "version": [ @@ -57381,8 +57456,8 @@ "deps": [ "f" ], - "commit": "1f284ab9d731bab9e5e211a3b5f75cef8cf659a2", - "sha256": "0rx4bvr4rym42ivb0z9a4xs7wkbagi0sydykybmr6scqrybx4jwj" + "commit": "68271c7784d9ef7eee61d1f55dc050225d3448e9", + "sha256": "1dzjldfljbmxfwvh3krfkjww6rxff55bwgah9ixmcrlw73gsz1h1" }, "stable": { "version": [ @@ -57892,8 +57967,8 @@ "ivy", "s" ], - "commit": "77aa87d2ebbf1a0189321b6cfdb2dff5df4de737", - "sha256": "02dslll7ywcrf3vdzazzcyyiyy282nfqqj155h2cv9asnlh7z3nn" + "commit": "044aef3c5f9302cdf326f88b785a355fdeea6336", + "sha256": "1x9gw5xh390naa258xany93w1p37zbwmg87ikjvhxp4zidypwrr2" }, "stable": { "version": [ @@ -58346,8 +58421,8 @@ "s", "searcher" ], - "commit": "5b6ad49b927a570cb8ba0c52b6a5c527c0f0b7f0", - "sha256": "1s0aqfbvr2f6y6ay1f4dm937qvq9rsnlv0k3r99023kzvk3wjpb5" + "commit": "55f5cf2ecc268686e7e124251f3c46c5065368d8", + "sha256": "1fahbnkg12dknkyrcszqm6c848rbalg0sgrxfanq7p9n7wpvskd8" }, "stable": { "version": [ @@ -60239,14 +60314,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20211230, - 814 + 20220225, + 810 ], "deps": [ "s" ], - "commit": "e90b1ed2cc806262b0ee772dcc88f8da693d9210", - "sha256": "0jhfb2shz71kwfzmvlpzhldm2rms3wgwikrym2a2fr9hw91i2zy7" + "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c", + "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h" }, "stable": { "version": [ @@ -60287,8 +60362,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220216, - 2301 + 20220218, + 512 ], "deps": [ "dash", @@ -60297,14 +60372,14 @@ "spinner", "vterm" ], - "commit": "d06598796f863010e6783b48e946d0337b88e68f", - "sha256": "1b8ggag14mp8wwfkn2kcbcyfpykvncpymrs7zyxnlvy98kyqmypv" + "commit": "fc67e4d603907160766cf22e8ef16029238e78d3", + "sha256": "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7" }, "stable": { "version": [ 1, 1, - 4 + 5 ], "deps": [ "dash", @@ -60313,8 +60388,8 @@ "spinner", "vterm" ], - "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", - "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" + "commit": "fc67e4d603907160766cf22e8ef16029238e78d3", + "sha256": "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7" } }, { @@ -60538,8 +60613,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220212, - 814 + 20220226, + 1619 ], "deps": [ "f", @@ -60547,13 +60622,13 @@ "transient", "xterm-color" ], - "commit": "f60f57ad3e8c97509af3ea925dbb3afa2a25f814", - "sha256": "1gkfz54x80a5k1nw2dmcqs3m7cp1zsm7v7hmbz9xzrszfdiq5zil" + "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", + "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "f", @@ -60561,8 +60636,8 @@ "transient", "xterm-color" ], - "commit": "d4ffe4752d36915f5dbd8da11b38b4a81743cbc4", - "sha256": "02rrmhacmbh43wqfvf2ls744q5zkr5c1qr4r0miajhy7lnz1binp" + "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", + "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" } }, { @@ -61465,11 +61540,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20210523, - 403 + 20220222, + 639 ], - "commit": "2af814641fd0cca7b379ffb025ab49917330651c", - "sha256": "1bd78f1sjs47zqvvp8b0mvrlk6qcrivnnbx5qavabzsfg9x9ng5w" + "commit": "f0f8b04f9f8e7863bdd3459d6ee6fd88ecd55dcf", + "sha256": "0vkaz5ifqasn2q51hnx024pdbr48xvx07g1rclfpw26990ah6yqa" }, "stable": { "version": [ @@ -61546,26 +61621,26 @@ "repo": "DamienCassou/khardel", "unstable": { "version": [ - 20201019, - 553 + 20220223, + 934 ], "deps": [ "yaml-mode" ], - "commit": "ca021fad32430e3f3a995d4158e73b5ee485258d", - "sha256": "0p210q71cn7a4sg82638mxc4v8b2lyi6yv888fjzwnxc804ahwxc" + "commit": "1436ec5ef1b5b26104a4735ee64c0afe148700de", + "sha256": "1pa7kl3d0hmgybbvsffhinn10qmqrkkzccprqcmwhc246yb4abqa" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "yaml-mode" ], - "commit": "5ee835a4429c58dec3900e4fa3d7cc1e778c969b", - "sha256": "0k2q0m7g9bj4k5xc4cldhi7cfbb114g016abyzq3q3jaymja195z" + "commit": "1436ec5ef1b5b26104a4735ee64c0afe148700de", + "sha256": "1pa7kl3d0hmgybbvsffhinn10qmqrkkzccprqcmwhc246yb4abqa" } }, { @@ -61724,8 +61799,8 @@ 20210318, 2106 ], - "commit": "27dff1fadbfe2d42d0f8097a8ae72cf1aa8bd3aa", - "sha256": "1xpzh74agsczq4qxg3hl6gmpvspszyrnp6mk1m5z7wkhya7312jh" + "commit": "71aca81024898c9c6ef88962bddc5462a93ffa0c", + "sha256": "05w51blhz9527idrky4c9j24vqlk7dnygws4ynsp78icn3lmixx6" }, "stable": { "version": [ @@ -62438,8 +62513,8 @@ "highlight", "math-symbol-lists" ], - "commit": "3629d0081b3b1ded717c2dd8611132d45c0e8cc4", - "sha256": "11kw2ns1y636h50d44frbycv8q619ysvaz55dccbsxwbcpha0lnn" + "commit": "df2081b207ddef0fe1b83d8a2405858d8e361bcf", + "sha256": "0v2xj6x6g11g77lxzj4j777ajkwf448h0a71xzy6zggq16hvw9ma" }, "stable": { "version": [ @@ -63763,8 +63838,8 @@ "deps": [ "request" ], - "commit": "3736a80aa1d87389d8472a2310f24d8854be943f", - "sha256": "04cba1xshwza0y562vcgq9dcn54snqjjb4vlvz16b4qsdz1ghicn" + "commit": "19a77b73e655d4ed5de50674ad0f8c44c8f6f7b1", + "sha256": "0a7fzbapygdq6jrwbiy0cmqyf19hdzrzv7xd1f1pwa8vknhzjn7m" }, "stable": { "version": [ @@ -63805,17 +63880,17 @@ 20220209, 755 ], - "commit": "2437b101739f2e1b02a87327180fcad415498b57", - "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" + "commit": "35d666b3e14c69eeb968f16ca8635a57b908d8ff", + "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" }, "stable": { "version": [ + 1, 0, - 36, - 0 + 2 ], - "commit": "a66064050e228d7d3e322817f841187a8f38b089", - "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" + "commit": "7032d39df69b5d727215c1f31e5bbc29970a30a1", + "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" } }, { @@ -63834,8 +63909,8 @@ "ht", "indicators" ], - "commit": "c17c316b8593e5c9b662172131fd187d5e742d4a", - "sha256": "0jii3lvsp5cx5yqiaz5v5hmxpgll9ylirc9853s5m2gad3z6cy3v" + "commit": "c2e3b1411665f882337adbaf53af831ee10e3034", + "sha256": "1x81saxhzlaf32hhjaah1z6s7vn7jcdxxpckj4na3zx3ncg1r5jp" }, "stable": { "version": [ @@ -64080,8 +64155,8 @@ 20211004, 1429 ], - "commit": "7b208f99612a359690da76efdcce7196fef6a65a", - "sha256": "0n39573gkmqbmjlzh7al4qlhavmdqg3s7sz0xw7i7fbinq1lw88z" + "commit": "87241398f185a134940680c1f0d0f24951dabed3", + "sha256": "0i26bzba5ysvscghgc8lih8y3vvyl6jbmlny9m7790fgy9zkps1g" }, "stable": { "version": [ @@ -64577,6 +64652,36 @@ "sha256": "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b" } }, + { + "ename": "litex-mode", + "commit": "7a4aec729e374988455cf454f3f067b2127449da", + "sha256": "1997v07hphs3icl2a8a2azm8iym64ylhnmyp85qf4xagxp7kwx8m", + "fetcher": "github", + "repo": "Atreyagaurav/litex-mode", + "unstable": { + "version": [ + 20220225, + 2010 + ], + "deps": [ + "cl-lib" + ], + "commit": "533a0c0777e25134d2782917648b6e8d8274a3ac", + "sha256": "0pspw0w0w8jzi97hhsrgniwjymf7ri59kqkjv9lrxycxddaccc5q" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "bad847232a9453db76a9a1de024bdcf4ed1e97e2", + "sha256": "07sic5ihf4680kcyw34gm1hyli7p63778awn697555bnmbd7y5as" + } + }, { "ename": "live-code-talks", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -64644,8 +64749,8 @@ 20220208, 308 ], - "commit": "9d310b173c4128fdd7da876cd84b9ef888567773", - "sha256": "1kwhjj5kkfdbgqr0v5kwyabp741rhww7ydlc3krajih7m18zsbsy" + "commit": "0070f01c244bd103b935052356f16b9c5d1d7387", + "sha256": "0l0w9p6vk6cjm07cmblrsk7f6vnz9b3i39yg6bzklzzqiwaskj7g" }, "stable": { "version": [ @@ -65040,8 +65145,8 @@ "ht", "s" ], - "commit": "19c3ab12689f2162fefc14061d46861c7f653a76", - "sha256": "11i9r69irn20rf8jxd78b4anmrx763qh672gkjjl0sna0pfs287s" + "commit": "ab124ae3b38e77f5fb14c8902928d7b010b00b41", + "sha256": "1fsx0lyfj05wqnl0i8dw1slxndcg0b2p1fmcdhxvmsa5k4l11v2y" }, "stable": { "version": [ @@ -65251,11 +65356,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220217, - 1452 + 20220227, + 1436 ], - "commit": "474b706dab58dfb8bec40b9ac5084b8dc26e833b", - "sha256": "085d6k3yi2lzyxm0raycr9ssavqb5yqqxn94jpvwhnlzg00qpiah" + "commit": "ac0e295080f08797b6a161ff1df550ff78e9c759", + "sha256": "11ngiihl3daynk03z9ndl3ivkgxbx0k4pg4qynw1n1j6pxasb0b1" }, "stable": { "version": [ @@ -65489,8 +65594,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20211120, - 1840 + 20220222, + 638 ], "deps": [ "grammarly", @@ -65499,8 +65604,8 @@ "request", "s" ], - "commit": "d929ce8c324a722554c866e7fd76857121f193cb", - "sha256": "1qlwz2cx03mdd40vwmgn7cvn1h3d1d1m58r48np1cs1bjf2wbmb2" + "commit": "f54d1a7ec9ee1b7bd4fd71490038064d49caa1b5", + "sha256": "0vjwwfl54lm0szsrr40mjzk3r10j0cmiks2gbwhf1aa948lwda82" }, "stable": { "version": [ @@ -65527,15 +65632,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20211214, - 1110 + 20220226, + 1437 ], "deps": [ - "haskell-mode", "lsp-mode" ], - "commit": "001032265f8770fc6a88c1dcd8838cd2707f0b30", - "sha256": "1axjafwfacsy5rcxavd6jf28gxrks94mnf4jcdvy5b78nz9imkpq" + "commit": "69ddd5d32d6d7d658ec3f89c8ec6280e912e6be8", + "sha256": "080k3ghhrnlnlq8dzqki6jwnxg3dvg2kzcsx8214k7sfp47qfkwn" } }, { @@ -65752,16 +65856,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20211024, - 809 + 20220222, + 656 ], "deps": [ - "f", - "lsp-mode", - "s" + "lsp-mode" ], - "commit": "8e30ee2f9190921f9549620145e46961db273d39", - "sha256": "052jw0an51wj3y995cxf7mxdbjsx8140196siq87fkccvwry18sy" + "commit": "daad61dbdbdac83267c6de04a13f8e2ecde3226d", + "sha256": "1aky40r4850d4203wj1wxgx3xq0pb8rdvcv3b957nclvn8fmzvzw" }, "stable": { "version": [ @@ -65786,8 +65888,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220107, - 1434 + 20220218, + 1105 ], "deps": [ "dap-mode", @@ -65799,8 +65901,8 @@ "scala-mode", "treemacs" ], - "commit": "743db8df15375ff9270424951d2dcc3a7e8e7a0b", - "sha256": "1251hkpjh0s51znpqhfg193c67fcyr9b7i9hfs8xfalivjpnj254" + "commit": "5891149014308e73faf025bf40cd099cc185277b", + "sha256": "165040pm6g8sm1afcdp6x6jciqpix12cskn7jhy21vr5ff0awsiz" }, "stable": { "version": [ @@ -65830,8 +65932,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220213, - 906 + 20220227, + 2032 ], "deps": [ "dash", @@ -65841,8 +65943,8 @@ "markdown-mode", "spinner" ], - "commit": "9b3a9215807af0727b514e8c7cf440bcc0bdad44", - "sha256": "0wq2nrg7dfd5570q5s8w36z3c8brsdby1q9iqfxrab7v1byxzyd8" + "commit": "2d640a146ad164f87c7796826791d7bcb85a8e7a", + "sha256": "0j7c5m7n7g7d16ldcqicw1f12dwcbak9gx5606qm8q8nlhk76mnm" }, "stable": { "version": [ @@ -66696,8 +66798,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220217, - 349 + 20220227, + 1341 ], "deps": [ "dash", @@ -66706,8 +66808,8 @@ "transient", "with-editor" ], - "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", - "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -67072,8 +67174,8 @@ "libgit", "magit" ], - "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", - "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -67221,14 +67323,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220216, - 1853 + 20220223, + 2013 ], "deps": [ "dash" ], - "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", - "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -67829,8 +67931,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "ff6cfaa5bb4d48f8909f0cc3d0da41720c1f69f4", - "sha256": "197087nvw8jdj2nqvrs12wkd72gbwygh7iv82lilffpb2dbvgfi3" + "commit": "e4d748adcf52c6d9483cd9d8bd91a1288c2d7052", + "sha256": "15321wq812plbn81g5hjagxz6pyg7z896zhicgac0v6dv0jz7cyf" }, "stable": { "version": [ @@ -68006,11 +68108,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220217, - 21 + 20220226, + 1237 ], - "commit": "097bd81743026c9b4889b860efd0283b26e64ccf", - "sha256": "1zkm3axkg676jcr0rv3na4v212cq4m2lpk0zac5a2s1y0fgvvx2q" + "commit": "5767b6ff49e26ecd6aa26f552397d5d2b8213d25", + "sha256": "143d57fy5i5ziwfxxix595k0f98ay5l57x5z69g8lkp6nb7b1rq7" }, "stable": { "version": [ @@ -68341,8 +68443,8 @@ 20200720, 1034 ], - "commit": "2bcfa9ecdc555279e74ef5a73966c636bff07743", - "sha256": "0cmwxpdj4b3pvm4awbpbvbf31qv7pkvknw3nj1qrpvmhj7qga5f7" + "commit": "74d9f566a41805cf7f2d49bb69400cca91fe7b8d", + "sha256": "0rmavxh8dvldzbc0glcg9ya2dv5gnv2nfrzc5r9yrj2slkip51qn" }, "stable": { "version": [ @@ -68429,8 +68531,8 @@ "request", "seq" ], - "commit": "813faf2381a7c4322c1ef71ca1364457609a3a57", - "sha256": "1skxk0ahvqqfxm0mg0940cf04k2zk6nln4dwgjfsw11dcj9ns89z" + "commit": "f7de456e918fdde1c7728e6fe435d9d40d98dd4b", + "sha256": "0hk3w0z9qh5wn76rab6glb269s2fardcy82llg4azjp2vna4zb4l" }, "stable": { "version": [ @@ -69037,11 +69139,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220217, - 1046 + 20220218, + 2024 ], - "commit": "2cbb794904002362ab342d8b6b27addbb119998d", - "sha256": "1irdasnwfh512d4dkwcsihmc6a88bxd3g490h4wbn4x87z8pzhzg" + "commit": "7d3139c9f55ba85c00e5f5b1a396be98fea1762a", + "sha256": "1brw32ghmk0l98wk0n34v8as0g816n87f8drq794y8hkx8iiw6lz" }, "stable": { "version": [ @@ -70609,20 +70711,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220217, - 1635 + 20220227, + 1815 ], - "commit": "4bd32dac89cc0e0ae9ad2074133ff1d2c60bdbcc", - "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" + "commit": "425d428a014125022315c2de69c17700a884d3ea", + "sha256": "0map0cy1p887bgjwswnzjq9qmvgw7r8g82515gvqb8x6xw2pfyj3" }, "stable": { "version": [ 2, - 1, + 2, 0 ], - "commit": "1c7776497617a6437a3ff3d805fc0eeee41d30e0", - "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" + "commit": "7b203db9e4295903792d999c40eb912b107ad30c", + "sha256": "14sik5hf3k2p4p6h2qrr5cknfzmksxyhng4xb2fg2cxdvxw7s1aa" } }, { @@ -71054,6 +71156,21 @@ "sha256": "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z" } }, + { + "ename": "morgentau-theme", + "commit": "4eaf2cdd0089bb115e68d82c1c91284d9a7c1c48", + "sha256": "1fa7rak2yyz1aqhgxli3idq99vp6rqds7va5n92lzg447jxp84mi", + "fetcher": "github", + "repo": "Melchizedek6809/morgentau-theme", + "unstable": { + "version": [ + 20220223, + 1047 + ], + "commit": "63792c50a1fdfdf85c6ba6d7a8eb9fc3ec0a434a", + "sha256": "0p448x7kl4y9zapkf808x4yxg86ifih95af2rhgzaxxm6ndvkyjl" + } + }, { "ename": "morlock", "commit": "b6ef53bbc80edda12a90a8a9705fe14415972833", @@ -71062,20 +71179,20 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20180318, - 2023 + 20220223, + 1454 ], - "commit": "b883d48024ddfffebe2d0dd69f5ed54c617f8834", - "sha256": "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8" + "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", + "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "b883d48024ddfffebe2d0dd69f5ed54c617f8834", - "sha256": "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8" + "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", + "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" } }, { @@ -71244,8 +71361,8 @@ 20210306, 1053 ], - "commit": "cdb6ca32615805af5d2b7aa1dc5a9b300ae1b09f", - "sha256": "04y80fmk5ykjdqkag2fz8zppnwdxs81dyqj1jl1xs5g75g6j3c6z" + "commit": "f4ed28f37281ae0f2318e5f52f46ba49d58c8ebc", + "sha256": "1k1aclfizzypa007x4zrpabjc8s8gpid7phwi1bycd418nhbx5z8" }, "stable": { "version": [ @@ -71761,14 +71878,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20220210, - 1405 + 20220225, + 1137 ], "deps": [ "all-the-icons" ], - "commit": "35ca0c9bd0d1512eed943f704ffc73ed97cca454", - "sha256": "1x7vkc7bagnk8xan0ylckj8wfxpqk2r4ij64vy9p0z0rgyrvj56v" + "commit": "66674ee00dbf953e7d8c1696fb12e9b5b4b272bd", + "sha256": "0pswfq8apihjglysphq3g4la39hyhrms0g010rp691m2mgg1lp39" } }, { @@ -71826,8 +71943,8 @@ "ht", "xwidgets-reuse" ], - "commit": "84a17bb3d725cb8b37cd700a6b88fbf98f5ca094", - "sha256": "05ygjbr6vbkji5jh1vyyyxh8inc8qis95xwp9zdjwc57dzjb2kah" + "commit": "fa47f35e56edcc84f00d622e415ae970cc5df0dd", + "sha256": "05pam9w057yfqaqy4y66zkdih3py2534pyawg5r4ph7154dr8d3m" }, "stable": { "version": [ @@ -72843,6 +72960,21 @@ "sha256": "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax" } }, + { + "ename": "narumi", + "commit": "961a81f77cebaf9361699dec65b733bf33bc92b4", + "sha256": "1d81z6zxxlv2sih28ar6s93ic49z9qy4q03r115k0559bqy47gjh", + "fetcher": "github", + "repo": "nryotaro/narumi", + "unstable": { + "version": [ + 20220221, + 313 + ], + "commit": "7a3b3c3a314612d16f89120b13ebeb8a4149d829", + "sha256": "0j47yah1prq9kvgx4nvbyvmvgivzalg6m1zjldsa63w76d8sfpqk" + } + }, { "ename": "nash-mode", "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", @@ -73637,8 +73769,8 @@ 20181024, 1439 ], - "commit": "f404f0059d71c8c86da7b56c48794266b5befd10", - "sha256": "10wk52s3ni9admzgm55vx6ci7f2dkwsh6z2rga63pyg52s88hj5b" + "commit": "c5e509481f1e53ceedc21d0315e125895b24d68d", + "sha256": "1w0hp5fzj6g6l0x77h3c3phq3hvm7klk7bgnk6c3didnvs47z9w7" }, "stable": { "version": [ @@ -74033,14 +74165,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220210, - 1734 + 20220227, + 1208 ], "deps": [ "cl-lib" ], - "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", - "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" + "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", + "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" }, "stable": { "version": [ @@ -74353,11 +74485,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220216, - 1156 + 20220226, + 1200 ], - "commit": "6286b76a69f11a72927c96a928d4493cab2237ce", - "sha256": "17zj6af4y22r703g2z6jw7pk2jn56iv5ai25q2y3z8icsnx0dmzv" + "commit": "7167b7556cccbb16ec83144a2f2a095b91a6ba02", + "sha256": "1i6cmaa530s45sawmfsabr8vvqlnk64bifill070jfzpgilxj7bp" }, "stable": { "version": [ @@ -74525,15 +74657,15 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20211230, - 954 + 20220218, + 1230 ], "deps": [ "dash", "esxml" ], - "commit": "2b4a7231aff6211a5a2f28719d830887aec6cc57", - "sha256": "11lwhwiyvhcj0gk9ifdjjj9iw41j3b5rdhk0x3hl8mfibrpqg3fs" + "commit": "0a166007f6430564360c31b5c68fca45a0c610d2", + "sha256": "0zgycw1bf0f1hf5apl1pmzviw4kizgpfd2gb36fpwky83a4r38xl" }, "stable": { "version": [ @@ -74596,15 +74728,15 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20210930, - 703 + 20220222, + 1650 ], "deps": [ "jest", "transient" ], - "commit": "2bd544162cdfce69d70806446569d12ec27ad46c", - "sha256": "024p9wn365qdl7gmzljk6hp9snixqffg3vqqivndxbgykcjg4sar" + "commit": "45d8084aeafae415dc45ddc9c3a18b546315fcc6", + "sha256": "1iai69sdjfl9ynif7cbg654r8wdcjlkk8w8qzd2x4wxg72bfa2d2" }, "stable": { "version": [ @@ -75691,8 +75823,8 @@ 20200320, 1504 ], - "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9", - "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4" + "commit": "b4ce25699e3ebff054f523375d1cf5a17bd0dbaf", + "sha256": "0fhj3241gpj6qj2sawr8pgyn5b7320vjfb7idsy23kh4jvmj2wb8" } }, { @@ -75787,14 +75919,14 @@ "url": "https://repo.or.cz/ob-php.git", "unstable": { "version": [ - 20220210, - 1406 + 20220221, + 1254 ], "deps": [ "org" ], - "commit": "e9d46541ca1b522ddf423dd8ec5b5d2f00b0b5ed", - "sha256": "1828h5cvl1cdinx45dn3xfqw49p1ivm633h6kb73mpi1mkh0ywn8" + "commit": "6ebf7799e9ded1d5114094f46785960a50000614", + "sha256": "1r99h49931xgqkw8hjyfw3agv8q9d87dkqnap973j4yjq36ddcw8" } }, { @@ -75829,14 +75961,14 @@ "url": "https://repo.or.cz/ob-redis.git", "unstable": { "version": [ - 20220210, - 1407 + 20220221, + 1249 ], "deps": [ "org" ], - "commit": "937099d74f2e8cb68e4166c141ff742a278c4dec", - "sha256": "0r5ciwdxnsw5hilx6s65mg649zzrysydfd28c1llhjwhjqcdhxrg" + "commit": "44c83636ccbea0b3e9838b0180471905c30224c5", + "sha256": "0rm78qhjdfx1klv2gk04sm8h3vw3hdimaxfagrdc2j5nhbzxffib" } }, { @@ -75929,15 +76061,15 @@ "url": "https://repo.or.cz/ob-smiles.git", "unstable": { "version": [ - 20220210, - 1412 + 20220221, + 1255 ], "deps": [ "org", "smiles-mode" ], - "commit": "5a5462d25b24ef30960740202c3952c55278fb1d", - "sha256": "07qcydf2w5xspl6v9qhzyi8yvn8qagf926ybm38qjxxdfza0vjk9" + "commit": "d178f3d4a7e3c1ca9910f0a063d2a3cfd97d8609", + "sha256": "0p31nv4haqhnh7zbmj875sw547ach8wdybmfaqqsb4vk749wq7a4" } }, { @@ -75969,6 +76101,33 @@ "sha256": "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk" } }, + { + "ename": "ob-solidity", + "commit": "af4ad88a12fa74927ae7549d855917715132be96", + "sha256": "1bdl8wv8njq9lmwlj7sqzq6yrjc6b70v6p1a41dgjwvj55pjy6qb", + "fetcher": "github", + "repo": "hrkrshnn/ob-solidity", + "unstable": { + "version": [ + 20220213, + 1910 + ], + "deps": [ + "solidity-mode" + ], + "commit": "7e3e6cb2d7ec9269514e80248c7ec85c04dbbf89", + "sha256": "0zghs08558z8n7wx5r38szjhczvzyk3r7q8p107vh2v0adp0qz3d" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "d0ffe51b4fa02f5bff59e2e3c3f70f01255c28a9", + "sha256": "0fwhk7shjxxkdj1phmw60pagn3axfqjn7p0wibvaylplrnx2h7hp" + } + }, { "ename": "ob-spice", "commit": "79b2eab8f2fc328df6c24661f35b246e46e6e5ec", @@ -76298,17 +76457,17 @@ 20210923, 1348 ], - "commit": "88b09cea663b20f9141fe52ce3e47c7289dc27cd", - "sha256": "01ziikn7lr41040pdb3zwvhhvpi2ybfh3z40yxq4zd1ahafk7z3y" + "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", + "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" }, "stable": { "version": [ 0, - 20, - 1 + 21, + 0 ], - "commit": "74668925ca977e252acb084bd139b3077cf95b58", - "sha256": "1q78gxsz763d6vbi1lyfmn7733l10qhq80bchdli9zw7sggs7nq1" + "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", + "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" } }, { @@ -78450,8 +78609,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20220119, - 2142 + 20220222, + 1915 ], "deps": [ "alert", @@ -78460,8 +78619,8 @@ "request", "request-deferred" ], - "commit": "6e26ae75aea521ea5dae67e34265da534bdad2d1", - "sha256": "1814w5bgf9zwvsga4926i002q2xg2qgyrmb2jlkc7gzv0j86ccv9" + "commit": "f7a3145fac5d7e637a7cc557e5196086061159e0", + "sha256": "0s4nai9c2s237cwy6649zsgqp6z75129ly43v0kibfvf4pgrbkxw" }, "stable": { "version": [ @@ -78774,16 +78933,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220129, - 2049 + 20220225, + 158 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "f424364605b21e5f1686f8ce2645afe543538684", - "sha256": "1646hr3mmg0ppa4xx9gjc1zkdryfs2m0j39cjhrfxcn05gsykklh" + "commit": "96e92585ed6f510f87363be3cb10d804f67e1b52", + "sha256": "1n1h3xby4998hdv6j4gllznzbhh4gl2wr9bm4235n859zypq9b4l" }, "stable": { "version": [ @@ -78887,16 +79046,16 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20210315, - 28 + 20220218, + 1845 ], "deps": [ "dash", "org", "s" ], - "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257", - "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h" + "commit": "5310e208d151f460f9b7e3961b4796842e91a3ae", + "sha256": "1d7v9vn9bli4lj59lbcldhplg46g79038j9avzicwgrysm74ybic" }, "stable": { "version": [ @@ -79177,6 +79336,21 @@ "sha256": "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn" } }, + { + "ename": "org-modern", + "commit": "2e87a00dc3f61007db361015f4d3131cb265530c", + "sha256": "0ppc6ww3alzsc13jbqzjyrcci36f4r1kby0y4s8k1d3d1brqq0py", + "fetcher": "github", + "repo": "minad/org-modern", + "unstable": { + "version": [ + 20220226, + 26 + ], + "commit": "fdb7b59682b656a998bf8821d112283e1a3edbd8", + "sha256": "1ihzv6n4zwxq51gba6w3bgzb4ws18h79z8k1iw24gpbz6pw0pwww" + } + }, { "ename": "org-movies", "commit": "ea06dc48003ba3c4f8e70fef4738cdb306362198", @@ -80179,28 +80353,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220214, - 1344 + 20220222, + 1041 ], "deps": [ "dash", "org" ], - "commit": "38724365176f50b7a94ad13c1215ca4755e16a28", - "sha256": "11zl5a350cg99aja5xmn48fgziqhi5ivdra61rk8yh4x8bmhxmc9" + "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", + "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" }, "stable": { "version": [ 0, 3, - 7 + 8 ], "deps": [ "dash", "org" ], - "commit": "0926af467579d801fa46c108cb4e55325328aebc", - "sha256": "12378ny4q5bixpaz6a93nvng906ys63g7npk3iw8j5mmw83yknd7" + "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", + "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" } }, { @@ -80250,8 +80424,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220208, - 1712 + 20220227, + 2050 ], "deps": [ "dash", @@ -80260,8 +80434,8 @@ "magit-section", "org" ], - "commit": "b163c900b8ec2e3637bc251d9b90421efc771c02", - "sha256": "0ifvysgmdcn6gjmqm9cdb6rkl5bbg3db6pgj9gbzz734bvx3648d" + "commit": "65ea325071777030978a85cac73ba6741a3c00a8", + "sha256": "0knk77scs08w2gwkxw8an0d743mz1mip6v8dcg44wh8xwwf2hvg1" }, "stable": { "version": [ @@ -80296,8 +80470,8 @@ "bibtex-completion", "org-roam" ], - "commit": "714b519f000697983eee291f7a28d595ef731d99", - "sha256": "0sl9dy63g6isjj5kmcc3lijjlsjwdp1fb11zri454lvnlmwa4w8i" + "commit": "efdac6fe4134c33f50b06a0a6d192003d0e5094c", + "sha256": "13hin77krfwaxfc7bh9bkp2h1kzn1ksng46j129yz3996gv55k1r" }, "stable": { "version": [ @@ -80339,16 +80513,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220131, - 1539 + 20220225, + 2151 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "309fe3c58c7081de4e2c9c64f7b40ea291926048", - "sha256": "14qgr3jwn42a8wy07g03j55j5shnvv52ma2wq1zf34dag7d4fghw" + "commit": "df1f9522c5a9cdb248208427fa9df4f2a7666e2a", + "sha256": "03kyg95f012ql0gpzy58kzxgdfksig5zlbr1p9m9ycgqmmxyq4jp" } }, { @@ -80595,27 +80769,27 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20211230, - 1606 + 20220218, + 743 ], "deps": [ "dash" ], - "commit": "6b1b3b045390bf1cff8214ece54da07c7a0aa8ad", - "sha256": "0zih4bfncjkkrx9v4f88a26kz41vgd7wvvfm2is5wk93nbcrazz4" + "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", + "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" }, "stable": { "version": [ 0, 2, - 9 + 9, + 1 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "49237ef8d174a15a594d984438cebe23ffcf54df", - "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm" + "commit": "338650e8fd4cb02aad68939f4baa3269b73b233c", + "sha256": "1fh2ryli8xyvnndjhk3miynkmd5xrdinlqybkcglwd6v48yd7c5c" } }, { @@ -80633,21 +80807,22 @@ "org-starter", "swiper" ], - "commit": "6b1b3b045390bf1cff8214ece54da07c7a0aa8ad", - "sha256": "0zih4bfncjkkrx9v4f88a26kz41vgd7wvvfm2is5wk93nbcrazz4" + "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", + "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" }, "stable": { "version": [ 0, 2, - 9 + 9, + 1 ], "deps": [ "org-starter", "swiper" ], - "commit": "49237ef8d174a15a594d984438cebe23ffcf54df", - "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm" + "commit": "338650e8fd4cb02aad68939f4baa3269b73b233c", + "sha256": "1fh2ryli8xyvnndjhk3miynkmd5xrdinlqybkcglwd6v48yd7c5c" } }, { @@ -80883,15 +81058,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220212, - 1727 + 20220224, + 358 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "10286cce91a1675c681c482a4f2d99ce5dd220e6", - "sha256": "1d9z3kczbs6jp02c2h2m36dixw7g5zy6h8xai9w1zhkzirqx6dmh" + "commit": "c9bfe0d84f1ea6aa18febf098ed47dbf7373782b", + "sha256": "1ldc8calzxszqr8zp3fq5ix72pszg7wjh48a7wmj2kzd6p56akh6" } }, { @@ -81261,11 +81436,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20210414, - 1844 + 20220220, + 1757 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -81292,6 +81467,21 @@ "sha256": "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7" } }, + { + "ename": "org-view-mode", + "commit": "330276d0ed7b053a96f428824c8746abe6999518", + "sha256": "1zijkjp1iszsjfbiclncqh6wsp9nfql109c4171pqsr55xwx0n3x", + "fetcher": "github", + "repo": "amno1/org-view-mode", + "unstable": { + "version": [ + 20220218, + 2106 + ], + "commit": "88321917b095a8cbabfa8327c915bd46eb741750", + "sha256": "05yll158r3zxs45z3radpvnwqz0vak07l26g6595crpigjay3q03" + } + }, { "ename": "org-visibility", "commit": "74651e72ddac645b792786d7c590180298201da7", @@ -81300,20 +81490,20 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220109, - 2003 + 20220227, + 1536 ], - "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", - "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" + "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", + "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", - "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" + "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", + "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" } }, { @@ -81377,16 +81567,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20210330, - 304 + 20220221, + 928 ], "deps": [ "alert", "async", "dash" ], - "commit": "772806f9d46fb93cabe9409c7a559eb7b9cda3d3", - "sha256": "0cp7gr0b83s830q1fzd4gwwz4x1n5cyh4r4v73w2cfml3kqf8nz1" + "commit": "860392e309e75474ae03128ce52b6592bd28027a", + "sha256": "1npl118j457zcsmn2b4vsx6kmz8v6k8czrqgmi2fl7aql5xhvp6j" }, "stable": { "version": [ @@ -81595,8 +81785,8 @@ "dash", "s" ], - "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1", - "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g" + "commit": "32f6cfc7265cf24ebb5361264e8c1b61a07e74df", + "sha256": "0dja2mwzzrn64c2qxvf325x88bwch7s29qhpv6jb4rn1143d4qyf" }, "stable": { "version": [ @@ -81688,8 +81878,8 @@ "ht", "s" ], - "commit": "a9189e2688f774c8c3b9e2366d94b137fbf3d271", - "sha256": "1454wv4xska8lrsdl88s59zr5zi2wil8ip727wr5wp94n2jhq7j7" + "commit": "9570a0d438cd41332e273a057cd697de859a39ec", + "sha256": "1b7wn7b50nrps72v25c644bm19j7z0d2scpdh1bjmk1zz0mdzazx" }, "stable": { "version": [ @@ -82446,11 +82636,11 @@ "repo": "articuluxe/outrespace", "unstable": { "version": [ - 20190724, - 1553 + 20220218, + 1936 ], - "commit": "d8c1619ec81fd3f4e728212a3526cd13bc2b0147", - "sha256": "0rcr85slklpaqhx5j8agd8yz6lg66qisniqlbz6zm4vvszqh0r4a" + "commit": "4b6f8a103b2ce76bb0638eac9356c462402b0665", + "sha256": "0dsiid2g93cc9k1385igbn26rqmdn1nr11l3gfaikcqbrh93pdgw" } }, { @@ -82855,14 +83045,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220217, - 1816 + 20220225, + 358 ], "deps": [ "org" ], - "commit": "f7838b766d200efbcbe06dfd4dfc529fbe5a689f", - "sha256": "1fbgf7zdmx22a1639yixbgajcs61rymlkwi3hbdwp3dx5li6k78r" + "commit": "8503350603c10d1e264f5599ae288fd71725919f", + "sha256": "1a5idw9p83m3jnf8s3f0lg28pw5059n05q1m4j5d92wajxlxf2wv" }, "stable": { "version": [ @@ -83238,8 +83428,8 @@ "deps": [ "org" ], - "commit": "b8722a0197c3ad935c80007b2f413bb005f255b2", - "sha256": "0jj00i7ji59qrw536wz13xzixgskawv032l5p4zwf7brqd573zva" + "commit": "0849028a2e4a274bfb0fc85d9538203ddf72a9e8", + "sha256": "1syzqc1lhnpkrzzd2hwxmaqr31dn44gcqwy5db44y8fr6nkrj6n0" } }, { @@ -83969,8 +84159,8 @@ "repo": "r0man/paimon.el", "unstable": { "version": [ - 20220214, - 2145 + 20220218, + 1904 ], "deps": [ "aio", @@ -83982,14 +84172,14 @@ "request", "transient" ], - "commit": "826a11d449a6cc8453093d79a8c031f43f753139", - "sha256": "183lvy7i71ilsp98hqifmdhagf2a57x7lbhw5qq0nzk4jjaam2yp" + "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", + "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "aio", @@ -84001,8 +84191,8 @@ "request", "transient" ], - "commit": "3ea3c862497573ea426d9f0cbfdc4f2d34e626b8", - "sha256": "00jff4q36wnpgi0qs4316g17zadqiinw5kr0z5gbdr6l21f49yzh" + "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", + "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" } }, { @@ -84221,8 +84411,8 @@ 20200510, 5 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -84519,8 +84709,8 @@ "deps": [ "s" ], - "commit": "5c163ffc63d52631c1494c260b50d63c04c37a97", - "sha256": "0xhbr59sn0220ymqlxjm45zzphlbmig7jhbz8z8kwa9paw2bqnz1" + "commit": "fbb88260179dd92264325dee37d7898619407558", + "sha256": "0ysgwj56wj8cbm8lrn24r89rbsxgc3s8idvx9x5apxddcjin80ik" }, "stable": { "version": [ @@ -84745,11 +84935,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20210323, - 1816 + 20220222, + 1757 ], - "commit": "114b721ebbf384b6af6fd46797e83896a9e14aca", - "sha256": "1zwc3wk770plfwlywqwiviqv9hiskf3fsl2nv9zp4gmvphzrqvql" + "commit": "456a01e959140cb070e77bce5032a6885c7b7ae0", + "sha256": "08achm8xxpadkqk0jk6nk0x8zk25xwn59xmvybj1rsmm4apnqsqx" } }, { @@ -85530,20 +85720,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20200921, - 2309 + 20220218, + 810 ], - "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932", - "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh" + "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", + "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" }, "stable": { "version": [ 0, 3, - 5 + 6 ], - "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932", - "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh" + "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", + "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" } }, { @@ -85714,14 +85904,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20211213, - 435 + 20220225, + 2254 ], "deps": [ "cl-lib" ], - "commit": "d8211a80fbc2cc0d9e163ef6a3e1d0a693b4e00e", - "sha256": "1p7il5s5r582w7if3v3cwkvdb6myszkf2fr2f3sw0x70x644bq2z" + "commit": "7297dabf6de83642e8242052fe95c79d4233eac7", + "sha256": "0rf28lq8nz3mx7hkcny10wwiaj27ph8hwpvqjji86x89w9w67pqr" }, "stable": { "version": [ @@ -86672,8 +86862,8 @@ 20210629, 1257 ], - "commit": "1959d2d5e09fde5244f9f945fec043cdffd5d37e", - "sha256": "00iyyvqs28l0qgzwm57r6qibdk98w4sdr4ilxsb1f2lrir75q6ir" + "commit": "d8ce5dc595a053e80debf6c1e330995c739a8b05", + "sha256": "03m9mnl19rwkpk7yi86g39wfnngz377kj8ihd49xxscgi4k1nd55" }, "stable": { "version": [ @@ -86825,15 +87015,15 @@ "repo": "arifer612/pippel", "unstable": { "version": [ - 20211205, - 1711 + 20220225, + 1128 ], "deps": [ "dash", "s" ], - "commit": "1e96053ffdcbf64e4c8a0a622feddc3cb0a82ded", - "sha256": "00rnzy7r397k6dwsflnv5lc7x5hcnkr4g784zj3bs8rq64h7dcz0" + "commit": "682a40af266f395cf39862ad0bfb30152ddee204", + "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7" } }, { @@ -88033,11 +88223,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20220125, - 1433 + 20220225, + 1521 ], - "commit": "f2a2b9772722aaadf13bd4d35652637b495952d4", - "sha256": "1n6jj3lz72kh2kqp53fx7h2ggbh6c4s96v6cyhwjs4sls40xrbjl" + "commit": "8ba56f841cbbee102e4fd00dff0f88646907bd09", + "sha256": "0vz52wagbpjg3c2br3cl9zhciq74c1is81crkrxbcdwsms1bwhiw" }, "stable": { "version": [ @@ -88687,15 +88877,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20211127, - 1502 + 20220221, + 1004 ], "deps": [ "request", "s" ], - "commit": "02c9d11a3f407023aa7c7b080bb9f8a5f5e7cd7a", - "sha256": "134m24v9xxnnsr180sx9li938jn5lx7kny2095fpl90qgpn3jd5q" + "commit": "810a25056c623f304de6a72123652d9c35936718", + "sha256": "13pzfqjh734lma8yfmp6a7r0j4a8jk3r0dc38hlx1vxwp0pw5ags" } }, { @@ -88798,6 +88988,25 @@ "sha256": "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x" } }, + { + "ename": "prefab", + "commit": "15837c8aca3dcdf55cebdbf1bc1d69d840056742", + "sha256": "198scgrwhiwyi6cbr3agh8q23m92aybvmvrf3fah4dqz35iay6yg", + "fetcher": "github", + "repo": "LaurenceWarne/prefab.el", + "unstable": { + "version": [ + 20220210, + 1658 + ], + "deps": [ + "f", + "transient" + ], + "commit": "70c20db8423e39e9889222531ba52715c6d5ce87", + "sha256": "1f4qikrs9zdnnr6f1a5vwb0f9kqn1b7fb5n5n9r14h1wc6pn6y48" + } + }, { "ename": "preproc-font-lock", "commit": "582692267795c91bb7f2ec3bffc2b9c2be9f2a32", @@ -89357,8 +89566,8 @@ 20210715, 1213 ], - "commit": "4db55e41560daa2a8f5d21a99fde65d75abdc4b1", - "sha256": "0c3dlip7k1dambqdnqrbr93a8fbg7q93g1vvkbq99fzvvyp867r7" + "commit": "15b58b2220b6a09922164cedc0892f57ad148785", + "sha256": "1dpx6i0fhkkiqcx4la21grsyhkzcwp02qzpa7j9hc984yv1s1973" }, "stable": { "version": [ @@ -89514,11 +89723,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220211, - 932 + 20220227, + 551 ], - "commit": "0243ad7dc96072126fc6c23e48184a0419bab028", - "sha256": "0ryvhffvf8dv0x6g1ianisw7ff8zxvcdz5x043fld33mykfp716h" + "commit": "2c948f3a8ed378ae5fd800d2c66aece06ba058b8", + "sha256": "1nmdyd8bldgs0zcsdqdjj4c5kq3742019qlxprx2cqs640fi5y2s" }, "stable": { "version": [ @@ -90019,8 +90228,8 @@ 20211013, 1726 ], - "commit": "2f7ee91e326d95915b63918f968244cfefbc022a", - "sha256": "1y90vjdnz7174xlyp9rqc3jhj4gq0l40nzfm3nih9chnmz6ifgx6" + "commit": "cbc9826db7a7927956e4c5094427580291f55f47", + "sha256": "0zvlq5lqy5c6bc02v6442ljw8gp377pqnkfv3h4x60xqv0lqpfjm" }, "stable": { "version": [ @@ -91110,8 +91319,8 @@ 20210411, 1931 ], - "commit": "67055f4221324a5aba057c0e7e3a5ffdc41a7e35", - "sha256": "03ggzjjiqx8q555vaif9c3wlzyn5bdql8pfwjiwcnxvgbxwz8l81" + "commit": "90dafaef06809eab8fb1dda8bc0955b959fe1e23", + "sha256": "19rxhzbgj5fp0awgij7i7p26ippd5qf4a2c4yzm8vjyjvvmmd5vs" }, "stable": { "version": [ @@ -91458,11 +91667,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220216, - 1924 + 20220223, + 1329 ], - "commit": "3e28ca0310774c83026c927688610fa36fc4992a", - "sha256": "0606ypkwwr545ap09sc4x8c3pkal03xj70i354mv79gfy6n149xd" + "commit": "b26546ff9d5d112baf822563beffe6f7fdd3c327", + "sha256": "0yx5bq6fq6y1v69cmwxchmxx4lnq5zgc5q0izz392bbpbyha9xzc" }, "stable": { "version": [ @@ -92101,11 +92310,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220217, - 1940 + 20220222, + 1947 ], - "commit": "a946f57c3af6238f94e4e750cffbc2324d7f4a38", - "sha256": "00mflc9i762pl13askadgn7nh60mfbf4r8wb4lfb0111q96x5nvi" + "commit": "30b5dfdd3a11a513b1c21e448fc8cb1ecc8a71bd", + "sha256": "0fgg2qn5b5d0zm2id80jx9jrdyb4z1fjd8sbn11ajiawsjb9wb3d" } }, { @@ -93410,11 +93619,11 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20220102, - 1257 + 20220224, + 1333 ], - "commit": "c5ad65274f8e20fbf7a4485a5b51b50a5cc6b4c9", - "sha256": "0vnnkz5fgbdkr44yfyhv8w8vyzj4pfvi7858rgxw4sgj3zbj3x3p" + "commit": "e9bca04318fef45badd487cda002ff9617429f6b", + "sha256": "0cjn61dn67vxz3495h7klszqwkjv17bmlfv01adj8d2cibc5wqi3" }, "stable": { "version": [ @@ -94410,8 +94619,8 @@ "f", "s" ], - "commit": "8d4dd03f8c12ea4b40fea90d0ae1de122caa5451", - "sha256": "1clgdhjspa613fhqn03didq78yz4nn2i7baf4nlq86b55g6ql206" + "commit": "7f37c27f52049dae3c2630e5383dcf29fd2260d4", + "sha256": "0a8cf6wp918mxmx90z26mafi6gzyh8sj5qdc3jzjm5yzv4a2n3n2" }, "stable": { "version": [ @@ -94785,8 +94994,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20211210, - 1806 + 20220222, + 228 ], "deps": [ "cl-lib", @@ -94794,8 +95003,8 @@ "popup", "posframe" ], - "commit": "bb1b5282f08187a00fd59ece7aefa6f476c77c1e", - "sha256": "164q3j88r2hnqaaf6qahy2db7a7s4j31fwz9bzz00p1gn4chrm5w" + "commit": "e5727c5218a4345adb9b960cf6f4202246aea70c", + "sha256": "14vifq3ksmr0dg4lp293pgr70j76ajasvrm9j9hf3jspq7hbxb0x" }, "stable": { "version": [ @@ -95843,11 +96052,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220203, - 1832 + 20220217, + 2009 ], - "commit": "832980d96a3b7e985bc8bfb1dc2bd7e9599c6312", - "sha256": "1dlg6526zfpflmvsq12fql0ri6l8mchs0bi8malx9v8rxn84k3bp" + "commit": "c8ae5dedb3deddaf35f6345da894ae26d156bf27", + "sha256": "01r727n9gp5c7pmgnka53igcaaphfjy7lqb9w8bjjp7db9ccnacd" }, "stable": { "version": [ @@ -95890,8 +96099,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220217, - 1820 + 20220227, + 1323 ], "deps": [ "dash", @@ -95905,13 +96114,13 @@ "spinner", "xterm-color" ], - "commit": "6f7a6055cd5f21903ec1e405be096fafc03626ed", - "sha256": "070kw2lcj5lk1ps9azsamx1wz7zy9c7w51384pwanwc72fwbsaxb" + "commit": "4140ce28ed7beda6b7a1cc6e6cbf242856f1dbb7", + "sha256": "0sd1n4wxw68hj2x87r5vhii3c36p64i36d4mx6ml8f91gxh4nrc6" }, "stable": { "version": [ - 2, - 7 + 3, + 0 ], "deps": [ "dash", @@ -95925,8 +96134,8 @@ "spinner", "xterm-color" ], - "commit": "737b8ace93565a0435305fc46707307b2aad3888", - "sha256": "0l1gh6arxrbq927lbj229pwqk9ly6z97b581smh434r5bh5wk8j5" + "commit": "b3f4442f7198eee758958196f89a150f8de8963a", + "sha256": "18br5yfakfwcbw3vkawhw5sm41xg78cz4bimz36x5xcgbwi88k3p" } }, { @@ -96415,8 +96624,8 @@ 20200830, 301 ], - "commit": "eb274ac9a18e2557946787fd84d231304f2b6419", - "sha256": "1fh9hdccs1qk8piar0fay42rdikacichjhanw80y521my727454v" + "commit": "fef5275f9df821b169bcf5973646c10c9179e876", + "sha256": "1xrwbf4hvm3l33j35q0xii6yrzpqx9v0rvma8p7j41afhhv9fcp0" } }, { @@ -96974,8 +97183,8 @@ "dash", "f" ], - "commit": "eea299701a4aa9500c4790c2a2e8c157f1d900db", - "sha256": "1ln4hpk759m7r9p0qc6fbz9s1hq2mnhmx1gz8iqab6zqbrnl2js0" + "commit": "65498b584dd074f69e0c3fa61309542f77acd328", + "sha256": "0q27192qvf4p8cy0ks8bifag2zk2ncyz1ig1sjdwdbwx0drinw7p" }, "stable": { "version": [ @@ -97420,15 +97629,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20220202, - 1359 + 20220226, + 1344 ], "deps": [ "dash", "edit-indirect" ], - "commit": "a2cea75f7b66a02e28334291fc6fb371cd5741b1", - "sha256": "133r9s2zbc1k2jd9ajxbxss0iy9xsjphxzwfhfvvay8jqy0r71gi" + "commit": "a33a04479fc1d4fa0ee618833965ce9914b9c1f4", + "sha256": "1llvhm9kwv67rng7zd91j5cfx34aklx64drs3hrm5nlxpjass7sm" }, "stable": { "version": [ @@ -98390,8 +98599,8 @@ 20210715, 1227 ], - "commit": "b3e4eba2994c368d742b9593a2e618d7b02e60c1", - "sha256": "0zxww99hcvn5c17m6xnyycfjy2lwvlrfxzslhw0ifla1qzj7ipy8" + "commit": "b5f6338f381c796a528d399a3fbaa4bb069d185a", + "sha256": "0wagh0jw2pkkq4rqkvcdj6rdnmnsz983r6mc9fsxnl0nwm8d9m7m" }, "stable": { "version": [ @@ -98928,6 +99137,25 @@ "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb" } }, + { + "ename": "simple-indentation", + "commit": "9e9dc1f3efcf5e816474958d6c42a36b4fc9aa40", + "sha256": "1s51a055abfbv0x0k008qlrar054jwcyy4bf0h6ashk7gnkrvvg6", + "fetcher": "github", + "repo": "semenInRussia/simple-indentation.el", + "unstable": { + "version": [ + 20220215, + 1745 + ], + "deps": [ + "dash", + "s" + ], + "commit": "e7c8238af9e1a6b1fc4dab8014d779ac178fc249", + "sha256": "03abad2hgkq5k5q7v4mb7ykd55wa6zg5a8ss62gsdwi373a9mkhh" + } + }, { "ename": "simple-modeline", "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823", @@ -99433,15 +99661,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220217, - 1145 + 20220227, + 1043 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "33d9f46a48809fab77fc0aef209196d99be4df0c", - "sha256": "0mxznpp521nlc2n49f05gwxcjcgq3ssmvsvsrzsr8abipdi5zkni" + "commit": "8bdcc23f9b9738dd400b98b4503bb359b7bb43e4", + "sha256": "191rqs073cis7cswjmgxmjp9fw30d8n3kqbw9x8kzqqypw0s577l" }, "stable": { "version": [ @@ -100576,28 +100804,26 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20201224, - 1744 + 20220223, + 218 ], "deps": [ - "cl-lib", - "magit-popup" + "transient" ], - "commit": "592901893f297099ffb759b4d1359bcd3411d1a9", - "sha256": "0rmvzrkx56zrlziln9cbq9p7lpm7jlv6i1mfrzrqhri239xlybn4" + "commit": "0dfeaff6079558c39081c2c078c41369da01903b", + "sha256": "0mir9ic4ywhyhhsn7y2qwy2s5h4qlrxz11mrs6680d2ki1bnyc81" }, "stable": { "version": [ - 1, - 8, + 2, + 0, 0 ], "deps": [ - "cl-lib", - "magit-popup" + "transient" ], - "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393", - "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm" + "commit": "78abd82f34a71b3fff7aa869de1b07a082f1f351", + "sha256": "1621pvbwq5b0kgk735w4dnpar30x3ckbhx18bdwv03rc7ngdnj8r" } }, { @@ -101601,11 +101827,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220207, - 54 + 20220225, + 102 ], - "commit": "cc331a92f5e81613796110a529b3f9fb511dda87", - "sha256": "1z4nyax8glnvax7fj05p2mgwy9g1gbs4n0lqghc4a6ih0cm314nk" + "commit": "fba53cc8d05d768dc7835b06d0fb857d7f13d5ea", + "sha256": "1lmf3zmwain0y6psmdazbbh240p64a4p6cwlj55sngbnzqidf7h1" } }, { @@ -102692,14 +102918,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20220208, - 2122 + 20220218, + 1707 ], "deps": [ "cl-lib" ], - "commit": "08e7b3474bb065d128734b90cd8c6c9aa3b6aece", - "sha256": "1x1jdg6k75d3r26cikf7vfzh69sam39vlwcx4srqr5czl15c5ins" + "commit": "20aa58c5ccd85f6c4f288a14e79adc66e691cd23", + "sha256": "0hghcfvj5pr8hvrrqfka91yghaf1gzhc3jhv68dwaq01lbqnszqz" } }, { @@ -103368,8 +103594,8 @@ "repo": "Wilfred/suggest.el", "unstable": { "version": [ - 20180916, - 1859 + 20190807, + 851 ], "deps": [ "dash", @@ -103378,8 +103604,8 @@ "s", "spinner" ], - "commit": "83a2679baf661ee834e9e75921fd546243a6d919", - "sha256": "11jqglwqi5q14rk44z02dffk6cqmhjgdda0y63095g8n1ll71jsb" + "commit": "7b1c7fd38cd9389e58f672bfe58d9e88aeb898c7", + "sha256": "04cabm1wn1cy78a47rhn1kh8vd6dclsr2js8plvldbgq2qfq7l4q" }, "stable": { "version": [ @@ -104238,8 +104464,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220127, - 144 + 20220221, + 252 ], "deps": [ "evil", @@ -104251,8 +104477,8 @@ "seq", "undo-tree" ], - "commit": "f04d372646d13c3c4ee1aae1230815e8e4d18280", - "sha256": "0avpjfpnmx3az3ahxgzd4ki4hm2n5xsdsjcki51b41vlrkwmijlk" + "commit": "520682d49e4e0684d6ee45cfa8d3157e830778b8", + "sha256": "01kfqwh7dkrq4dmdaxf5z6f3hj144d34nhfnjsq204mbnq37mdph" }, "stable": { "version": [ @@ -105133,15 +105359,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220216, - 1307 + 20220221, + 1453 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "9b0525e5e83de3ce86666c3d147a30a6f10f01de", - "sha256": "0apbf523gcmg9qkldznfshas63fvjm172bh922faflqn8wp8jb4b" + "commit": "8402e7e2f016e372585273df35ea8484a7c4854c", + "sha256": "0k9q83xllhl1bmyrraylb38q285s96p43cbiagkq4lghib83d03l" }, "stable": { "version": [ @@ -105188,16 +105414,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220108, - 2147 + 20220218, + 449 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "4fd47989c499ccc973f0e904cf1649c037ff1626", - "sha256": "1wm10pb9k9s7mzswsqynm80cnh9wbndw4f9cw9h4z1rw28p1hvc5" + "commit": "aa7b1ec159252f8a25f3c75fcc346fa4b0b3c73d", + "sha256": "0dy3w69rndgvhlfp5mx4axdgn517ip63js219vb8m9514mswhxav" }, "stable": { "version": [ @@ -105254,11 +105480,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220213, - 1913 + 20220223, + 2047 ], - "commit": "5242ebb37fbf14f60c8eecf4461091ee22389912", - "sha256": "1j6f9y50w4h7cn4bl3dabv8d1i94kc0cf0rla825lglai206cwrx" + "commit": "40de509ff635b75d877d83d42d8e36672fdcc47d", + "sha256": "1h9sj8w6yrrlf1gjwv7lxzkbgam78804f8zm8d3knic8qv3h03lk" }, "stable": { "version": [ @@ -106277,18 +106503,18 @@ 20200212, 1903 ], - "commit": "82d2e5abebb400997a1587115275bc2f7211acec", - "sha256": "0d15fka004yqmcx6z4brzrr37iadnggg7f31cf0l4qaqnhi9zswf" + "commit": "6781ecec4ba66950d04180cc0c2adac4f9a1e39f", + "sha256": "0c6ag1yv08xfwh8cmv3jp9i7kr9ppha9sp518vy9pq8cz151xcyw" }, "stable": { "version": [ 2022, 2, - 14, + 21, 0 ], - "commit": "e47a693bc7921bd20ee6cf425f6ecd4f834249a4", - "sha256": "04agrdspg4q19kddpynhnngz5qrkrh3kjaccx5whb36a6p5a0730" + "commit": "4d159d0224c848847f37e247b2935dd11ff0cac9", + "sha256": "0yqbl77gvd550k7pcn1vscb4kdkayp410bsya93pzrlxfxnygp90" } }, { @@ -106344,8 +106570,8 @@ "deps": [ "haskell-mode" ], - "commit": "12c40a5b6d9fafcd3b895d9b90de1ac97483cbbf", - "sha256": "1gvn70a9w9fbn5wr3dzlnsyhyyrq602k61g82irh5z4amarq1blh" + "commit": "9dbd4c9b4dd4adb550323376a25a50917c971b00", + "sha256": "1pb93a7c29xz9ni4q71hclhpsh36bap3rb502lw4a8acsfim7jxq" }, "stable": { "version": [ @@ -106955,11 +107181,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220215, - 1121 + 20220222, + 1140 ], - "commit": "f78976e448853646e3b5e718783ddb8256bf341e", - "sha256": "06fc46gxsbc8wv3y68n4pxyz34cfln7b5pbrwih68qs4ybp51nn8" + "commit": "3e856aa9388af2d5acbc77f4f7be7eb920f26760", + "sha256": "1wgf1xw3fmbzawl8hykxf6sa7gmrp6vx9bpcv31199mh1nzx7iin" } }, { @@ -107052,6 +107278,30 @@ "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, + { + "ename": "topspace", + "commit": "c980427ea621340ed8a50c4fff310aa6bca23bfd", + "sha256": "1fypf1zcf3f1fq9fg763k887j1vnj6kmr1qf43g9dnk3b9d9zwhg", + "fetcher": "github", + "repo": "trevorpogue/topspace", + "unstable": { + "version": [ + 20220225, + 1808 + ], + "commit": "42ee2417302b57ea9e81c1c455841b1578934cbc", + "sha256": "167bs3c2vbvjiafgnkyic8pb538cmv9k2df3phh5ly8bk0jzx17x" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "4eb27abaa182e856ba3f3c8e1e84fdd2e1f009af", + "sha256": "0zfc5ix16kk5mwjs5wiqkfaljdhahb5hsb76hmay8nwhg5xsadkj" + } + }, { "ename": "topsy", "commit": "89d455ee48c4567e098bb733396fa2729bec58c6", @@ -107416,11 +107666,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220216, - 2303 + 20220227, + 1751 ], - "commit": "72b8c013936b8e8d891105144107781a43516735", - "sha256": "098j2yflc84xy0bfbxzdf5f413j6gy77ncvpn3j8xy9qi5frnn0i" + "commit": "7c771c94c8fc31d859c1e083bf32fbce403f4766", + "sha256": "1x4bk5m9s5zag8din004n3paiy8l560p2cwcyfc9y2zjn7h5p42v" }, "stable": { "version": [ @@ -107549,8 +107799,8 @@ 20200910, 1636 ], - "commit": "9d65b39ec3cee901566bead7a8f82941693c43b5", - "sha256": "1qmmryy2plw5qrrqh7y5q63sv93hbvffkl89sd0m1842xi2jzd2i" + "commit": "ec3d59c9be9a6ba3b8d4dbfc6f8834c9c3d14f7b", + "sha256": "18mqlcbic82naypgzgr8fw7zjcxp3096c5yhjspz349igqw32y01" }, "stable": { "version": [ @@ -107838,8 +108088,8 @@ "pfuture", "s" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107876,8 +108126,8 @@ "all-the-icons", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107908,8 +108158,8 @@ "evil", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107939,8 +108189,8 @@ "deps": [ "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107971,8 +108221,8 @@ "pfuture", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -108005,8 +108255,8 @@ "persp-mode", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -108039,8 +108289,8 @@ "perspective", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -108072,8 +108322,8 @@ "projectile", "treemacs" ], - "commit": "2b19baaf2a69897dc274bceff56070372033de09", - "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -108089,6 +108339,14 @@ "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, + { + "ename": "treemacs-tab-bar", + "commit": "fd08b4b2dc7476e39c210207313431e554de9bb9", + "sha256": "1j5ch9jki388dhjnc7lsi6drvrsajjrdhxhqr55hq8ns1dhm8gl9", + "error": "Not in archive", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs" + }, { "ename": "treepy", "commit": "63c94a703841f8c11948200d86d98145bc62162c", @@ -108694,11 +108952,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20211130, - 1332 + 20220223, + 1506 ], - "commit": "e82416205158d4b21d42d6b60c4385f68f0ae1b1", - "sha256": "1gidnpwk4n9zsrv9jxb7fmn3i46sggncv62w1aaw6g6v8h3yj5ad" + "commit": "84ff4228b5d1af287f35c9869e8eb079184a9831", + "sha256": "1kjw7phch5vyxc7gwkcwdl1p0cy3zzg7vyx4k1p5dbvh261k7c6h" }, "stable": { "version": [ @@ -109116,8 +109374,8 @@ 20200719, 618 ], - "commit": "ad3913d41471852a56ee9c46cf76198de9b020e7", - "sha256": "0nzgrad4h2v9a5c7qq2mhj9q9yk0kags921pwlwn86ywq338mfkc" + "commit": "33cb9f541b1f7d4fa675e244822c8a074ebb4c4e", + "sha256": "104170qlxrvg5gr1m3ajfnankvnd3700k46lhrh7i356jl23kh1h" }, "stable": { "version": [ @@ -109205,14 +109463,14 @@ "repo": "emacsorphanage/undohist", "unstable": { "version": [ - 20210517, - 411 + 20220219, + 634 ], "deps": [ "cl-lib" ], - "commit": "56c6f58873f8ebb743e4dc5aff143744720375bd", - "sha256": "1ayf2rgw0y0qa65s585408nxdqpq6vgyz8l015crk72l6hv35l8n" + "commit": "94959e708d5a74913788324893d0b6dabc88ff18", + "sha256": "09gf5bm2kwgfx4b1rbnljarzj9mfbx3f0xiqias3cbj0x0lmwmd1" }, "stable": { "version": [ @@ -110057,11 +110315,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220111, - 743 + 20220220, + 150 ], - "commit": "bf64ea24fd1fdf5ed7e4ed14bc5f84303fa17a58", - "sha256": "0mhz64hsml6fp4lfwrx3w5i85finn0s417r6ccfyk911zm70fm9x" + "commit": "b590f6d3643ff70dfde0181abb287d7b24073067", + "sha256": "0zp6zyxk033n8p3ccaz50mrnhrcnb7w40b0xjm1lk4snap3hlihq" }, "stable": { "version": [ @@ -110673,8 +110931,8 @@ "deps": [ "vdm-mode" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -110700,8 +110958,8 @@ 20190328, 1408 ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -110727,8 +110985,8 @@ "deps": [ "yasnippet" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -111513,8 +111771,8 @@ 20220214, 1401 ], - "commit": "899a46132c47b37e262e66ebef3bf7f89f9b161a", - "sha256": "0i0wbs9w3rlfqal3pwbvjqqd85yw5m3whmycgk4d1md5hcw8pdym" + "commit": "6fde70a06788e2b8851e765c75ae76cd1655287d", + "sha256": "10wjd76qrr503rbvpklpcxz74pcx08zvqgn3g6a0qrzpsiigkscd" }, "stable": { "version": [ @@ -111536,8 +111794,8 @@ 20220214, 1401 ], - "commit": "aaed826c9c7e34cd86f173fd30a9a677addf0bd5", - "sha256": "1hbxpjvbcksp5c5y4yz1lvyzwjq66ji6v61p7rv9jpm45bv6r09g" + "commit": "6bfe9144b626b98bbb67cbf512f3419c25ae973f", + "sha256": "05rkm1zlxmz65z1k9i3nh1dgd6arn97h0cyv3mbyw0pksfnf0gx7" }, "stable": { "version": [ @@ -111716,8 +111974,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20220214, - 647 + 20220218, + 1024 ], "deps": [ "bind-key", @@ -111726,8 +111984,8 @@ "s", "versuri" ], - "commit": "0b46ce53aaf1b7d96ec2d9cedbd5e143bc27fec3", - "sha256": "0y10y5r0aa84w1z2aj16w4pxfsvda6a84hkyhc6xjng5sg3j3flh" + "commit": "aed3272b95fc73fd78712ff7dcfc05916f382fed", + "sha256": "0faxcgvi8r6nchvgh2dzmnawbv5qzsf1aiyfg3f39pskcrnip62v" }, "stable": { "version": [ @@ -112032,6 +112290,21 @@ "sha256": "0k6jysr9sdz3x8h0pslpssjr23hwp358472vmgd2jmfzvjk3m21i" } }, + { + "ename": "wallpreview", + "commit": "8822842e06fb8bce3b62847ed1ea7c9d64f4d7d3", + "sha256": "00i4j7ki84yw2sihd9xjwh6gvp0xi5yql7nmsgdqkhp91qcmkn8k", + "fetcher": "github", + "repo": "nryotaro/wallpreview", + "unstable": { + "version": [ + 20220220, + 427 + ], + "commit": "b1b8f19ae82b344a9577cea7b883ad513ec52222", + "sha256": "11s37l15g9sgvk0blvvw22griy1h51q14c42290yms8whnbp001z" + } + }, { "ename": "wand", "commit": "38be840bbb32094b753ec169b717a70817006655", @@ -112337,11 +112610,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220119, - 1026 + 20220227, + 1557 ], - "commit": "d95e0db1bd042d1a8c9bb6bf744eb07ecbf62d73", - "sha256": "0mw2ws23fvxc5lnpic8kbqii0rvjamdvff5xa7rywd9yiwv3yfm8" + "commit": "f70277774a725e177774cc81ecbd228792cd6656", + "sha256": "1kqjq0b0yfhnqxhmzsz7cw01da95nmakc1qjr8jk1m7hwljl3p4b" }, "stable": { "version": [ @@ -113077,6 +113350,14 @@ "sha256": "09jy46qxq5whk8l6znkvghjyc55cmi6z734aagmhiw33wmiyadm4" } }, + { + "ename": "why-this", + "commit": "f45e4eabb023673be2dd3c6c46e752085587c0e2", + "sha256": "1pb73qc67w73p664kfd0na1qmzbz00dmjz468smrpjjscqmazmp3", + "error": "Not in archive", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-why-this.git" + }, { "ename": "wide-column", "commit": "8d29def44ae42dc4b60c1d254a57572bd09faf51", @@ -113857,11 +114138,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220213, - 243 + 20220225, + 1907 ], - "commit": "cb0321c79abbcf31a61d9be02690b434ece55d4d", - "sha256": "09wamwxplj02xi603jkp246n0qynjaj83gvg7d3jn5z0fhgr6blp" + "commit": "19be797818be2d9ac5a0a8acf30b43ad38e2f4ed", + "sha256": "13yj1pl9v0345dnxwdpy50b74syrbqhlrf8ldfnxpiww090n7zmq" } }, { @@ -115059,11 +115340,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20200511, - 2005 + 20220221, + 803 ], - "commit": "c3218914269ec1ac97336fee3a88816b73437b39", - "sha256": "163y4a6hp3b150zwjgfxi9vs04sw2lcr3izmfa69yjj84nwcx9z3" + "commit": "9b42ba4612d3043464414c08a3d60f6ad594566c", + "sha256": "1552a71nn60h351i6kal25py2l41vhnk4nlvcc53fg6hx7pkrwg6" } }, { @@ -115335,8 +115616,8 @@ 20220212, 1742 ], - "commit": "289d547e66b7699ee11cc889d2df50ba863a9298", - "sha256": "1dn66733fcwsm9bnq26qsl2zca1r9naf02rg7lr97q7zycj6lfbv" + "commit": "d8674bbbc9d4d7bdba374f0c0473ebb1912bcac2", + "sha256": "1nryhfiddak70y1hhhzkpb2afy00kd7vc3vg4ja0frpdvdrl93pz" }, "stable": { "version": [ @@ -115404,14 +115685,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210910, - 1959 + 20220221, + 1234 ], "deps": [ "yasnippet" ], - "commit": "f50b4c16ca2a73fd04ebd301f0bf2f5ab6107d88", - "sha256": "0iglhbwnx2pk2p05ym43fh3p4vwd77kch6f8aw63jz77ia05cba4" + "commit": "b7c09f1ad7e1a62da6f6042bfaa2b26d111c7e81", + "sha256": "0r4rjsgd13n8k0ijypwh3ky0dzzmz0p08lfaalpbqk3w555mkzyf" }, "stable": { "version": [ @@ -115919,11 +116200,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220130, - 1555 + 20220221, + 2005 ], - "commit": "50e9bb9bcd62edf29d29a29b2b9b6b845db68174", - "sha256": "0yp0szhncygbb5cl7ai0296fiiz401r1wf7xm9kix3h2211zm5id" + "commit": "cef1e26146c1b8b32fc5ce346f2cfa9861eb67d4", + "sha256": "198n2pikpvk65bqivw7f8bvy9j9mpc2149zxzqc16m2868l9ngsx" }, "stable": { "version": [ @@ -116250,11 +116531,29 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220214, - 1500 + 20220227, + 1351 ], - "commit": "624ca6665e469b790dd66f6b6f0a1af10c384e3f", - "sha256": "11jzgrj8z2ich8n7f2s7lqnqdclmprvwwlxpkadd31dl7njc8fb2" + "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", + "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" + } + }, + { + "ename": "zk-index", + "commit": "01d387bc059e5d81d59ab5705082c56971a80b34", + "sha256": "1rd4wpisrjc7ahyv3hinmv7nmma7xnacq1q35bnyyhsc0vv6rxs8", + "fetcher": "github", + "repo": "localauthor/zk", + "unstable": { + "version": [ + 20220220, + 1952 + ], + "deps": [ + "zk" + ], + "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", + "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index b6d556b445..82a1d6af83 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -25,6 +25,8 @@ , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false +, withAthena ? false +, withToolkitScrollBars ? true , withPgtk ? false , withXinput2 ? false , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) @@ -32,6 +34,7 @@ if withGTK2 then "gtk2" else if withGTK3 then "gtk3" else if withMotif then "motif" + else if withAthena then "athena" else "lucid") }: @@ -50,7 +53,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - inherit pname version; + pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + inherit version; patches = patches fetchpatch; @@ -154,6 +158,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional withImageMagick "--with-imagemagick" ++ lib.optional withPgtk "--with-pgtk" ++ lib.optional withXinput2 "--with-xinput2" + ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" ; installTargets = [ "tags" "install" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 709a9b4251..a5e0a2611f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -27,11 +27,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Development;"; + categories = [ "Development" ]; icon = mainProgram; - extraEntries = '' - StartupWMClass=${wmClass} - ''; + startupWMClass = wmClass; }; vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 3f07b10a32..5f4700c166 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -251,12 +251,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3.2"; /* updated by script */ + version = "2021.3.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "029xim3a6ijqdbzwxan189ydcy5b0ry2qqc70fipp8ic5z5iai3b"; /* updated by script */ + sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -316,13 +316,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.2.3"; /* updated by script */ - versionMajorMinor = "2021.2"; /* updated by script */ + version = "2021.3"; /* updated by script */ + versionMajorMinor = "2021.3"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1j33b48ki1xw7xb1hr8k2jz7d78h0qcr1b5gql7i40d7szq0iy10"; /* updated by script */ + sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -330,12 +330,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "011i3jgfnb2h64ikbm3wi1vfhzm50mwwy9nksl71nzllj3kz111x"; /* updated by script */ + sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -395,12 +395,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1f918cj76b79x0d2hhv78mvmki5d1dps8nsx7i50wn2qzdml4kc6"; /* updated by script */ + sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index 7a9b030e82..8308830efc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: stdenv.mkDerivation rec { pname = "kdev-php"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-php"; - rev = "v${version}"; - sha256 = "sha256-hEumH7M6yAuH+jPShOmbKjHmuPRg2djaVy9Xt28eK38="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index 03d3fce67e..374b4224ca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: stdenv.mkDerivation rec { pname = "kdev-python"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-python"; - rev = "v${version}"; - sha256 = "sha256-xYElqpJjRtBRIyZGf6JaCvurQ+QrGrdLHxtuANYfCds="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix index 38fb55ecf7..e975678591 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kodestudio/default.nix @@ -39,7 +39,7 @@ in comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; desktopName = "Kode Studio"; genericName = "Text Editor"; - categories = "GNOME;GTK;Utility;TextEditor;Development;"; + categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ]; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index ee22c591ad..4a5f464f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -24,11 +24,9 @@ mkDerivation rec { comment = meta.description; desktopName = "Leo"; genericName = "Text Editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - startupNotify = "false"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Application" "Development" "IDE" ]; + startupNotify = false; + mimeTypes = [ "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/html" "application/inf" "text/x-java-source" "application/x-javascript" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index c2868fbac5..658c18e5cb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests +, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage , gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.1"; + version = "6.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "PVfsiT+/3tEmZbfw1WPXRDH8Q6vqzKzt6iO2avcE20A="; + sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -41,7 +41,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { inherit (nixosTests) nano; }; + tests = { + expect = callPackage ./test-with-expect.nix {}; + }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/test-with-expect.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/test-with-expect.nix new file mode 100644 index 0000000000..bd48eba432 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/test-with-expect.nix @@ -0,0 +1,35 @@ +{ nano, expect, runCommand, writeScriptBin, runtimeShell }: + +let expect-script = writeScriptBin "expect-script" '' + #!${expect}/bin/expect -f + + # Load nano + spawn nano file.txt + expect "GNU nano ${nano.version}" + + # Add some text to the buffer + send "Hello world!" + expect "Hello world!" + + # Send ctrl-x (exit) + send "\030" + expect "Save modified buffer?" + + # Answer "yes" + send "y" + expect "File Name to Write" + + # Send "return" to accept the file path. + send "\r" + sleep 1 + exit +''; in +runCommand "nano-test-expect" +{ + nativeBuildInputs = [ nano expect ]; + passthru = { inherit expect-script; }; +} '' + expect -f ${expect-script}/bin/expect-script + grep "Hello world!" file.txt + touch $out +'' diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index f7614e76ef..a00646437f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -10,7 +10,7 @@ let comment = "Integrated Development Environment"; desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; icon = "netbeans"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix index 96256e7ef3..c775a493f1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.6"; + version = "0.26.7"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-xWnNW1VQPkbfGltckWKwiIjEJqpSxvPy+SbGWL7gFEw="; + sha256 = "sha256-8SO1VpDWz19UfppdtziiZymoLnvQLMAAIjjOTZ/VMOM="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix new file mode 100644 index 0000000000..8ddd0d6a28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchurl +, unzip +, udev +, nwjs +, gcc-unwrapped +, autoPatchelfHook +, gsettings-desktop-schemas +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pinegrow"; + version = "6.3"; + + src = fetchurl { + url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; + sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz"; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + udev + nwjs + gcc-unwrapped + gsettings-desktop-schemas + gtk3 + ]; + + sourceRoot = "."; + + dontUnpack = true; + + # Extract and copy executable in $out/bin + installPhase = '' + runHook preInstall + + mkdir -p $out/share/applications $out/bin $out/opt/bin + # we can't unzip it in $out/lib, because nw.js will start with + # an empty screen. Therefore it will be unzipped in a non-typical + # folder and symlinked. + unzip $src -d $out/opt/pinegrow + substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \ + --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"' + mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop + ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow + + runHook postInstall + ''; + + preFixup = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ''; + + meta = with lib; { + homepage = "https://pinegrow.com"; + description = "UI Web Editor"; + platforms = platforms.linux; + license = with licenses; [ unfreeRedistributable ]; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index 50366863d6..5a790e7809 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -10,7 +10,7 @@ let icon = "quartus"; desktopName = "Quartus"; genericName = "Quartus Prime"; - categories = "Development;"; + categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSUserEnv rec { diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index e5bdc28b80..76c94693d2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "sha256-CLQWbwwJnr6Al223GvV1hVNK13p2iAyjNF7PhdaU9N0="; + sha256 = "sha256-nTFyRNJAhTrVlKdLd2F0jv7VcNn2pGTAegvfMjfHY84="; }; # We have not packaged tests. diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 04b688622b..eada77eea8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -227,8 +227,13 @@ in desktopName = "RStudio"; genericName = "IDE"; comment = description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + categories = [ "Development" ]; + mimeTypes = [ + "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown" + "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project" + "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html" + "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src" + ]; }) ]; }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix index 6b314dff93..cd776fb6bf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-luX4/KERB4GwpID7zVnd6F/mN8SHTy9zmqSUzJ1CYPk="; + sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index 4191f6fbd2..6e478693d4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -2,7 +2,7 @@ , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.9.5"; + version = "3.11.1"; pname = "standardnotes"; name = "${pname}-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -13,8 +13,8 @@ let }.${stdenv.hostPlatform.system} or throwSystem; sha256 = { - i686-linux = "sha256-7Mo8ELFV6roZ3IYWBtB2rRDAzJrq4ht9f1v6uohsauw="; - x86_64-linux = "sha256-9VPYII9E8E3yL7UuU0+GmaK3qxWX4bwfACDl7F7sngo="; + i686-linux = "3e83a7eef5c29877eeffefb832543b21627cf027ae6e7b4f662865b6b842649a"; + x86_64-linux = "fd461e98248a2181afd2ef94a41a291d20f7ffb20abeaf0cfcf81a9f94e27868"; }.${stdenv.hostPlatform.system} or throwSystem; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix index 7f14bf8ae1..074584e336 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/2/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Sublime Text"; genericName = "Text Editor"; - categories = "TextEditor;Development;"; + categories = [ "TextEditor" "Development" ]; icon = "sublime_text"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 67f1f7e604..4e7bfc2cff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-EUcYQKc/vxOg6E5ZIpWJezLEppOru79s+slO7e/+kAU="; + sha256 = "sha256-MZz8DQT1f6RU+euEED1bbg2MsaqC6+W3RoMk2qfIjr4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix index 9db68f71ea..67374b9b40 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "texworks"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006"; + sha256 = "sha256-v0UukFM5brPtgq+zH5H1KfUc0eL0hjTC9z0tVQRqu2Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix index 20d25bb616..eb6ba73b2e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { icon = "thonny"; desktopName = "Thonny"; comment = "Python IDE for beginners"; - categories = "Development;IDE"; + categories = [ "Development" "IDE" ]; }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index c71f057fe0..806e2f9d4f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.1719"; + version = "8.2.3455"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-166"; - sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; + rev = "snapshot-172"; + sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch index 49354aa9a8..6af3e384a6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.patch @@ -1,10 +1,10 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index af43549..dfb10fe 100644 +index 32c89b387..c2af70127 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -14,35 +14,5 @@ set backspace+=indent,eol,start - " translated to English). - set langmenu=none +@@ -9,35 +9,5 @@ set nocompatible + " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. + set backspace+=indent,eol,start -" Python2 -" MacVim is configured by default to use the pre-installed System python2 @@ -29,22 +29,22 @@ index af43549..dfb10fe 100644 -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") -- " MacPorts python 3.8 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") +- " MacPorts python 3.9 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") - " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python - endif -endif - +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index fd2d5e1..37a6d6a 100644 +index c4a3ada37..06ee3de44 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -52,12 +52,12 @@ index fd2d5e1..37a6d6a 100644 +MACVIMGUI_DEFS = -DMACOS_X_DARWIN -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe MACVIMGUI_IPATH = MACVIMGUI_LIBS_DIR = - MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 06257a5..68437df 100755 +index 39ef81449..d8fa7ec2f 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } +@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +69,7 @@ index 06257a5..68437df 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +93,7 @@ index 06257a5..68437df 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6499,13 +6479,7 @@ __: +@@ -6526,13 +6506,6 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,11 +104,10 @@ index 06257a5..68437df 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else -+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6520,7 +6494,6 @@ eof +@@ -6547,7 +6520,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -116,7 +115,7 @@ index 06257a5..68437df 100755 fi -@@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -130,7 +129,7 @@ index 06257a5..68437df 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -142,7 +141,7 @@ index 06257a5..68437df 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7521,13 +7483,8 @@ $as_echo "" >&6; } +@@ -7579,13 +7540,8 @@ $as_echo "" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -156,9 +155,9 @@ index 06257a5..68437df 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } - if test -f "$rubylibdir/$librubya"; then - librubyarg="$librubyarg" +@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` + if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" @@ -168,7 +167,7 @@ index 06257a5..68437df 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index bbc01ee..5a93591 100644 +index 4ff59f201..f91cb9836 100644 --- a/src/vim.h +++ b/src/vim.h @@ -244,17 +244,6 @@ @@ -190,15 +189,14 @@ index bbc01ee..5a93591 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b..47078b0 100755 +index 3b154f288..e89f26060 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" - if test "$1" = "-g"; then - # Try to use the GUI version of Vim if possible, it will fall back - # on Vim if Gvim is not installed. -- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" - shift +@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift fi - diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/aliases.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix similarity index 92% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 395fb6711d..3ad7739d06 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-02-07"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ee369de02aebc52e7d34506298556e15030c52dc"; - sha256 = "0d31lkaiqn5f8rg1asinp72hlngmfbih7rffb4q4zm5hwayyqi3p"; + rev = "0a229de4633a51548cb7257a116ea48dd4dd38c2"; + sha256 = "19w0lkdak24m94hn4sp37h4q30i4893b7dwdvr7kz29na6x254rr"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-09"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "47470eddc277e0a141e6e36a1e2a19045e051d1c"; - sha256 = "1wrhi9gwr5wjl7jdvqvldrl4480qcx6ry9gkl41dhiz643g28pvk"; + rev = "5b1044e2ade71fee4a59f94faa108d99b4e61fb2"; + sha256 = "02np6iarx5yp8m5lvp4rmgl6zlxy7m64sp3fix7hh9dy51h58xs5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,24 +101,24 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-12-23"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "7968693e841ea9d2b4809e23e8ec5c561854b6d6"; - sha256 = "0jayi96r6khkqm3khbmb83ygb41azxc3gq05ykkiy44405ri7k04"; + rev = "a955096c566843302a0a509680b92ab276488add"; + sha256 = "1ka9p2d2fvr1p8gr39fq44msjqkshg3r6pjzzsnx8r821ql0055i"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2022-01-08"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "f8c503ceb2d710b7a94814f56010dd3f5efe8ab1"; - sha256 = "1v9d1y7wk1zkd7wmj9lfqa448mlfw26yrbx6di5p7azhp60d21bi"; + rev = "93798e8c89c441d29d4678da0c0d5e1429eb43b0"; + sha256 = "0r2q7iyw0y7zaf33k6ka5ca9v6g7zlmya5x0ph5xgsylmglq6jca"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -197,14 +197,14 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-02-03"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "fc6d524b9d81850c15b9b374a1b4a1374e243ec3"; - sha256 = "/144rx2txz+VnPI8y4w1z9DY5nBEmp64arApRGiHQXU="; + rev = "6942fc4fcb2058fe1401761e97641f42aadb7758"; + sha256 = "12q9im1rd7zmdfw6bax7x7pjnlf6204ar70z77fv3cpi09r2s3sz"; }; - meta.homepage = "https://github.com/skywind3000/asyncrun.vim"; + meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { @@ -214,9 +214,9 @@ final: prev: owner = "skywind3000"; repo = "asynctasks.vim"; rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; - sha256 = "cw61N5K6GHwdT011oeFV+jzFw9tk4xahPcTnx5jwqPA="; + sha256 = "1w58y2ccgry47nhidqv4vg1wag7saphs2xad9wfpq65sj8vva3kk"; }; - meta.homepage = "https://github.com/skywind3000/asynctasks.vim"; + meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; ats-vim = buildVimPluginFrom2Nix { @@ -269,12 +269,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-01-30"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "5860ae9369c86332ec45b38ab8308b9a4afb272c"; - sha256 = "0klwbjgxqddw5apqzrx9fsqk25xy6nbaplx4fw68x6z0c63dbvsa"; + rev = "da8a37dc635ef25c39442351fb3c838d151eda71"; + sha256 = "0pn32l9pzvxl5fd8l3pxjsrzx0gv794xjh2flv0gf2f9lk4hvcbx"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -317,12 +317,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2021-10-05"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "6e638309efcad2f308eb9c5eaccf6f62b794bbab"; - sha256 = "0kvhwn3gr5x5vf2cgjda22naf8cvgkc43zalvxvr99s9jcjyynki"; + rev = "be65945626fb6bf6058cae61d5176d156f923c11"; + sha256 = "165ffjrwhhjdyssj96z4qn3fjys0dxwckpvjyzrpca2b2fag0cx2"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -461,12 +461,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-01-16"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "7451dfc97d28e6783dbeb1cdcff12619a9323c98"; - sha256 = "0w0ww4x6il3g7623rdnzdm82dg6484liglxzzd8rff5av6sx3ja8"; + rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537"; + sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -509,12 +509,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-02-08"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "406fdf2f2d2372df52d503e9f7bef96d89901c9f"; - sha256 = "17b07krgc9pzqhmwls2d50xbiqs4fgzmdi61qrz1v5n0bgs011mr"; + rev = "5169cd99bd4bc5f0c2d505e91190383c3c323680"; + sha256 = "1q5bz37yfzbnm6h9n0c3y8nn69zphsxjsjykly28xg6q87il9di5"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "95920369e18ea64bb5e1e5f1a3161c822681f325"; - sha256 = "1jd0vqmlwm9x28bdflbfcg3xgsff0mh011cwi1sq30llwja1jhf2"; + rev = "f932760f16368c5feeb079a878ed0ff8588aed29"; + sha256 = "18bpfbb8aj2pmh84mq6w3435nyha0xiqpralx8daxb89vl0drvn4"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -641,24 +641,24 @@ final: prev: cmd-parser-nvim = buildVimPluginFrom2Nix { pname = "cmd-parser.nvim"; - version = "2021-05-30"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "winston0410"; repo = "cmd-parser.nvim"; - rev = "70813af493398217cb1df10950ae8b99c58422db"; - sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6"; + rev = "6363b8bddef968c3ec51a38172af44f675f01ef3"; + sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1"; }; meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-01-04"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "f83773e2f433a923997c5faad7ea689ec24d1785"; - sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd"; + rev = "d66c4c2d376e5be99db68d2362cd94d250987525"; + sha256 = "0n9mqrf4rzj784zhshxr2wqyhm99d9mzalxqnik7srkghjvc9l4a"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -677,12 +677,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2021-12-01"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "29ca81a6f0f288e6311b3377d9d9684d22eac2ec"; - sha256 = "0yzh0jdys1bn1c2mqm410c0ndyyyxpmigzdrkhnkv78b16vjyhq6"; + rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0"; + sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -761,14 +761,14 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-01-31"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "0e8f501facdcc5bfdb5664ee185e040464a79625"; - sha256 = "tQ3xkJ34q5+ioi6lQY7F/ZjGngzmv4FDkpNeU5sRqK0="; + rev = "3cac37c0dfea9d42cf69d9638bb63f267c5a1033"; + sha256 = "1h4jjhczgx9kp4a0d9jf5qa0jkhb15zzdfhkpfgxfz2szh8frj0k"; }; - meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips"; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; cmp-omni = buildVimPluginFrom2Nix { @@ -785,12 +785,12 @@ final: prev: cmp-pandoc-references = buildVimPluginFrom2Nix { pname = "cmp-pandoc-references"; - version = "2021-10-11"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "jc-doyle"; repo = "cmp-pandoc-references"; - rev = "9f27411d118194fc9ee6e1f86574ad8077de54be"; - sha256 = "02g6rf2pzx1syhhbhrkxzygz27q2i1hsrymjcyj9q5h31wz0qzhq"; + rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54"; + sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs"; }; meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; @@ -929,12 +929,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-01-26"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "80a1100866354d2e057fb5a7ef979978b5990ecc"; - sha256 = "1jqx2195c01im5gnp5knqwgrb9fkxsasb9m54s8c2vhqg7i7j7pg"; + rev = "4f73c9dd68fdd9493e34020e3e626e788b95fd9a"; + sha256 = "0igsr25shrjl9fj8is6lpyff9l2by7jkjmck5n56wdn97cxav719"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -965,12 +965,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6116a010e18b7adcca024d95891da9af4e0dcd27"; - sha256 = "06sc3rr4dxk1j6glb6vyxkw8k9m90g7gd1zdgsj5pw7mxfk9xbik"; + rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32"; + sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -989,12 +989,12 @@ final: prev: colorbuddy-nvim = buildVimPluginFrom2Nix { pname = "colorbuddy.nvim"; - version = "2021-12-01"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "c678edd8113274574f9d9ef440773d1123e1431d"; - sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f"; + rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f"; + sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -1038,12 +1038,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-02-01"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "af51a8af6b213336345f36fc7aba65f9c3316696"; - sha256 = "1zzv4f1rxqfl9saf90gf6h5cbcnw1jc4qqm63x3zkl6a8s9qpj51"; + rev = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598"; + sha256 = "00yvac1iks83jy7cbkalx0hy3sg0d14hn4zd3jk5wc25c7f1jzmq"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1182,12 +1182,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-01-22"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "93a668527b203a3353ef2bd5337f6c55119bb7e6"; - sha256 = "1a5w1wmc5vx3y32rci5km73wj6vq6cjgc4ss4w0w95s7sk8kaggn"; + rev = "6c53d863c0843be0f68a138def146d6b8f725b22"; + sha256 = "1f5z99ac72433f2nj714fk6xd76mq7yr5i5z1afwgrhx61zbwn5h"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1206,12 +1206,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2021-12-07"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "c01314840b94da0b9767b52f8a4bbc579214e509"; - sha256 = "10vw2hjrg20i8id5wld8c5b1m96fnxvkb5qhbdf9w5sagawn4wc2"; + rev = "47eb231463d3654de1a205c4e30567fbd006965d"; + sha256 = "06znz1869h7cdh9xc0b54mysslgpf3qdwsj5zvnzrzk6fnfin03q"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "81aea6abdf8467b79fd8fe506d28f60391d30ac4"; - sha256 = "1fjjkwz9q91xfyph19hix9610s7g331mwq15wmpcr86vrmjvjbbj"; + rev = "1792fee68dfba89632022e9524c2dcef10d399cd"; + sha256 = "1y0ycmv1394mnxqzmrxx7ac846sy24cw7hgdxvp2w08cicysb38a"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-02-02"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ccfe42887401d99e4a1dfc89306f9376fbbc062d"; - sha256 = "0lvkzd3hwm4yzlpf5l77cy08dxx7r02zz5yg5w271bwf3lfcj61d"; + rev = "3526cb195cb381cef5d4fc25c532f00942562874"; + sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1458,24 +1458,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite.nvim"; - version = "2022-01-15"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f88be9be638fd93c8159d3d0434c6e0576bec6d1"; - sha256 = "1xkgbb1av95bi5svl15909mkbb0jhwb15x9fnvbypjzz1i4mvb82"; + rev = "fbee9c1d2ff6d58b6b24c079fbb221414857cb9e"; + sha256 = "1i0adlg0qldygy60ca1z5m7bh0mv4jj5alcd43m8n6inkr0yzsnm"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-02-07"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "acaf6b6282bfab2e28fbb8a01eea6da9b9c764af"; - sha256 = "19m1g79s55pyxcm2vg4kj52c9kkl3l2km07j9cwbq4qd8vm9vjil"; + rev = "bf9b2bafc76e290f11eabd654ac830034a4b553b"; + sha256 = "1hya333j0j7mhk1cnyjpy3rzmzbq7pddnyrjrl3bi4xhq8044g3h"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1748,12 +1748,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-12-17"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "eef47458679a922ef101c1e4c07fb7b36d701385"; - sha256 = "1k1zsxiq034x72w98117h5cakxxhxak7zq0gwlq812j4gqz8011h"; + rev = "cf32c3fcdbc2f6855f6bb883302c9f290e9c3d88"; + sha256 = "0vikawxr40pkprsn8yzpacs33hfakpb98j5lmpf7sjmvyzkb1x8b"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1772,12 +1772,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-02-07"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "607d027a8440c01be9ef8f433563ab0c8567d4c1"; - sha256 = "0pcnx53n7n5gk97kbxias65lslif6ymsjqcsvlfx0qf2bwwsdz81"; + rev = "fe7112ce7db0c8c65420e82aabfe7a98be2b538b"; + sha256 = "07vy5kf7pqsdqsz5jmqj6lm2aizcncfi4j1vmkpnjw9rpp3c733r"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1832,12 +1832,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "40ea50a854175d65f4ce9ea84fff39ba572e3f67"; - sha256 = "0wwp0hdvlri3kbq2b6glckyrbs4dbqynh25hgj3j77pc4zkjmjla"; + rev = "032c406c7f63874c459234beedf8452d2fa38ee4"; + sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1857,12 +1857,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2021-12-12"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "fd56950ca2427114f7d2e34aba312df3c2788cdb"; - sha256 = "1hns2sahc6yy8k3fkbpyd94sm3ywfcz3hndmijz5b1qnr5xhcvf2"; + rev = "495d3e2f56ee392de0d55902c82849f94b6fc86b"; + sha256 = "1m80hjm1m04dsivwqhxk5753gd8yzww62130wvgdsac3z394zzrn"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -1928,6 +1928,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; + everforest = buildVimPluginFrom2Nix { + pname = "everforest"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "everforest"; + rev = "7c5e520962a57f7cd42bb0b9eab268795375d26e"; + sha256 = "IBDWDvSpUHHgE2zslYfvznHyQmisbRZsF0D80YqcKto="; + }; + meta.homepage = "https://github.com/sainnhe/everforest/"; + }; + falcon = buildVimPluginFrom2Nix { pname = "falcon"; version = "2021-12-19"; @@ -1978,12 +1990,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-12-28"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "e54e0cc5338b44d97dcaab83dd67d5a522656774"; - sha256 = "10xqjh8dj470iikhpksbk0w767s3i73s4p4qnvpznr4lqkg7ckr7"; + rev = "7ddd3f02757b04f1035d0ae8bbe9d8461d536a2d"; + sha256 = "0dfv4a131x5c6njwiz34kfr0sgky8mmd3ifd7gpk5z5q5cwgbhg0"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2002,12 +2014,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-02-08"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "d415fcee2634b6c9bb4fad223c4e909498c6dcb8"; - sha256 = "0vs8nhhmpnp5jnqkmn5dz3mkhp894hyhv0v32j9qqsvdrllzsyjz"; + rev = "d2ceaeb0c16ff0ea38def9442d6062371cec1548"; + sha256 = "0p3r2xff2lkmvqc390nwn6qrgif5niclbqvs4hx0fypq5b86i33y"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2026,12 +2038,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-02-09"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "2a69ee6d17cd264eb10b33170df4cfce4cc4f4f3"; - sha256 = "0l7ir0fky6czmjkkhd13di4x39jhy70i0s0wjiiyqn9cdfm0xw14"; + rev = "cbe0db4f2adfddfd830310e5846f8735d4e068fa"; + sha256 = "0fg3rmp3nnb3hh8cs4mha96xjfzkgbs308a5lbmsbkqz9gi2l6yq"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2050,12 +2062,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2021-11-02"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "0e4e22d21975da60b0fd2d302285b3b603f9f71e"; - sha256 = "1qrf6ig1gbrbq6wrxqkabnqx6zqwjw7wqacl7q2ckw4sy6sam7mz"; + rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1"; + sha256 = "0b1iffk6pa2zwd9fvlgqli72r8qj74b7hqkhlw6awhc7r1qj8m1q"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -2111,12 +2123,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-02-08"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "80a14fae599dfd200c805c345a7515266abf3438"; - sha256 = "1d42mbxhry3scycykxh381xdykm225sg5v02f9lfv9r2r3ay81jf"; + rev = "c879f29c592afc9b9a15e4daa5fd7e78c56af89c"; + sha256 = "1669jww7cv9sv8v4z1sscilixmx2945h2rvz9afc384i1pfidips"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2267,24 +2279,24 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-02-06"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "7f677946f3243e563782834f55df5f97c36db036"; - sha256 = "0vjpnvg1qqalrg449k8in76fvv1hwv343qg5z6k0gcqakc5dxl2p"; + rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc"; + sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-01-05"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "0901c07f33164378cb9f21156d52661abc2158f5"; - sha256 = "11rzkw19m3nazsc202a8qrl11kb77nrhl8fbb076nf7s9l97lwkh"; + rev = "5957897f76b1f5fe3abbdd612d19be2c69452b0e"; + sha256 = "1d05nh2plyha3h8kr9pzys2730kbfxhb0lb2k2fg08bcxcnz144k"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2375,12 +2387,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-02-08"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "e2b2730254df7648c79794555978f10fceb4b163"; - sha256 = "1kmbhfphf128psrxps7iyb1kb2s1lbc63qkxwla1cl3ywnl7f8gl"; + rev = "1d1f043acf025f919b8dd12bb672569109c7f099"; + sha256 = "1wcinz5r81mcx246vxwqqs3dfc7j61x81bp9zf02p3hflhf66s7h"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2519,24 +2531,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-02-09"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "591ca7fa71449b0e6ffe27f4525c3ceecc0b5684"; - sha256 = "1i5yq5lj4ws8j3v4pc459ls69fgcgfh8a4fr98gnj4z650nprkpg"; + rev = "fde5af0921d4ac5e0b108417f3b57595ca5c7e7f"; + sha256 = "0sd106rkcsmypha79jwkangsh0i4dx4viiqgdqbk3hi05fsnwngm"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-01-27"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d4d0c6e66c1f4d5bdc0cb216c882d88d223a4187"; - sha256 = "0s12sxhpk59r8a12df0zbhbmj6djffqmh1pw2fhw392zrb1549m8"; + rev = "dc6bae93ded04ac542d429ff5cc87189dde44294"; + sha256 = "06mvdxi1pf9mw0zrk0cib3bi9p82ymdc3acm4r2rr4rqww8mrq4x"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2567,12 +2579,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-02-04"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "d035ef263a75029b0351f2be3708ec2829e2a3df"; - sha256 = "0zj44bcpsxdmxy36sfdbcc9587pasqffwhl72sjz943rvpxngng7"; + rev = "b2bb0d6f2b8a55895afda53f0ad04527998d3411"; + sha256 = "0izsscglfk6lpisxvarr0qw4m9br8854wi6jhyp2msd8r9gcrzi7"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2627,12 +2639,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2021-11-14"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "1d1acf102de7a5eed7de62691250b064d6db9d8a"; - sha256 = "0ihr85iisjc3xr9jhm4fdgzhrjr1krnvinzb2x8cgmk7zsl5l194"; + rev = "de698e1f8db5d1d3a65ba9dd1880096ae2d5ff7f"; + sha256 = "099dj5zvijhpvvd6r0zvsyl0v841cqh4vz678k1f7jcrpk6g9537"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -2711,12 +2723,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-01-18"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "4df4e9360975a8be6e7a7270466fedfd1adcc5b6"; - sha256 = "082ir4kslphx06x1fgyw31nc2yifx3x3p2233sjqibjjjzj0qafh"; + rev = "7abfc924714d3b7f19f3674cca0231cf6ef2050f"; + sha256 = "04q08syijlia2m8dbaf0854y4zp73j0ms1vg8wa7kr80rwvkrvbz"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -2783,12 +2795,12 @@ final: prev: indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2021-01-28"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "5617a1cf7d315e6e6f84d825c85e3b669d220bfa"; - sha256 = "1ns3v4r5m6ckchmkaqkpk8dymh7hwj22d7x23hagmk4zv4hc2mhq"; + rev = "7753505f3c500ec88d11e9373d05250f49c1d900"; + sha256 = "1lh6d3ljz1rmj3xa4f0n687fyxxc30dnmsq8mgd77v27f7lj62p5"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -2952,36 +2964,36 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-02-09"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a630e12de13db03313b88d6983cbbb81398eadcd"; - sha256 = "08rlj48cw7c9cslrkpiw63fic5yw8vvls7ifcw48m1bhpibxfmnh"; + rev = "d752c2eebda44f4ba96768ffc2d61ebe41a914b3"; + sha256 = "0qqav23q85yad6i0vlq5fx74cvb97gmvb7ncnhkrh0qy3z63b0hk"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-02-05"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "e3a1037905c27a04b1725dc4d4006c4408bcd198"; - sha256 = "12328xrsdhcysxs9ww97ngf134ibcsalf2a48c7z7bd48s8vajj7"; + rev = "95462e91b82542a3d602bec5a2a54a35abe29728"; + sha256 = "1vl4p6nlp7y3vd98qgxl43c0yrcpllbyjlzqa3ajjsgkgxdjn73f"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-02-05"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "83706980d6ed022317e45f7965c9393e0f4ad96e"; - sha256 = "0vipzqnscx2vqxskibbf0jf5ifrmxcwgz4ynahqgqg12z48jr4k2"; + rev = "12ecde4ed3ecb39964000a5fd034ae4c1d307388"; + sha256 = "0zf9p181rlkn0d0d53ckg4992wgdgnxpkgmn9hv2sajsrih4m0z9"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -3060,12 +3072,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-01-15"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "2ee9f4d0fcba6c3645a2cb52eb5fb2f23c7607eb"; - sha256 = "199fh056ks1p8l2jahwzr5azq3rihbzqrbk6pay32qh0ixk462qv"; + rev = "9bceeab97668935cc6b91ab5190167d9771b5210"; + sha256 = "1s2jyfssj1xvp2ym8a77pynjxw28722jj75i3lqln5i7v57dsjd9"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -3084,12 +3096,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-02-04"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4997c8d12a05c3e854208affa1c83914643e9834"; - sha256 = "0m3lr88cbzw3c9yw3860d34nmjb0bwq80cxa8sy6yya2hzs8c4qm"; + rev = "585503ef238726bc51bc3ce724afc0e8b64bf43b"; + sha256 = "0f6r16rhbc1k12d85a278cicqpbl3mj30pfra66s7kfv531lvw00"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3132,12 +3144,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-01-12"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "22d6495d6c3c1e6cdb26ea2e541e285a5651a98a"; - sha256 = "1aqzsckhh7abl41zh816w327f28ly8i2fh24qdgdjjmx4cpxbaxc"; + rev = "abfae597b52c621da63882c6d58f252a37815ac0"; + sha256 = "1xn4xv7br7k92q6nsrrys0qrj1bm10asycyrqcqzzs7wvd1qirlv"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3214,6 +3226,18 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; + lightline-lsp = buildVimPluginFrom2Nix { + pname = "lightline-lsp"; + version = "2022-01-09"; + src = fetchFromGitHub { + owner = "spywhere"; + repo = "lightline-lsp"; + rev = "78a8f6880c1d979b7c682e1b37299d970506f480"; + sha256 = "00zkpri1pi6r0m0v91361zixqsfrf05hyml61k4s0i3yabfv84w8"; + }; + meta.homepage = "https://github.com/spywhere/lightline-lsp/"; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; version = "2021-11-21"; @@ -3228,12 +3252,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-08"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "b04fc4e129512ce5ccd15acfe8388a898daa0a2a"; - sha256 = "0a7bz8v0lh8myj39vk553gkglmk83smqc3nylfabqyxkij1gmdqx"; + rev = "e53a14b2b279e92fbca9646ec14188ab76dd009a"; + sha256 = "13lr7kz2jny0slwshk85hv4ccnh3ywwmxy1wwq3a552cbk1p69j2"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3264,12 +3288,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-01-10"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "ca02a1031a2393ec6bf8967657daf06e4d402523"; - sha256 = "1r5dp40iwh227whbdizdgzkjbj5zzs1s0ryp64id3gn5vl1pfmbd"; + rev = "eaa706a38bdf889103806d10ccbe0be1983ca746"; + sha256 = "0j8rlkyq8snsyhjw6swr35ldznz9w64hhpcbyl7qzsgcjsn62kly"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3288,48 +3312,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-02-07"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "ba1a0f49e71849863b4212ca0ac1974aeb7c7032"; - sha256 = "1y55p429rd7z8jph30ils2g35vmqam4qk1ii9s88jwfl545g7qga"; + rev = "65bf5c03cd0b2a3c5c67a7600833092f89541344"; + sha256 = "1fayv5ldhvspjvlwpvpwzcggc0ih1va20hyd1krfhyj91842prz0"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-02-02"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "b45b0c869f2a77fc6d7e09503fbeb4663cc25ff1"; - sha256 = "0126maly11irv7r51fca9zgf3yazv9knwa46hlf7pf977nc30yc4"; + rev = "f044fa4b465a102375d8d977e10e6427ec81ff63"; + sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-02-07"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "07545e1c5bd5c081c7e28540591275cbb46b7d02"; - sha256 = "0pld9i7db4w4wqwc1nnmymfgr7miia60l1rj0pakfkgyf1g5w61s"; + rev = "58ee5063ca1cd333a2d0a4a9509de80c7582ee01"; + sha256 = "07qbfkjyf0j0mngn6bn4x4vypnl3sf0jaiwhw8iw7zqy4a1338rg"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-01-27"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "d29557a4024358cf028b706d91e3a95bd8180784"; - sha256 = "0d16jms75nm2phx4hyvqlr3fbjadllgznd5dsy53cjf0gnybd6h2"; + rev = "7745d713e067b5faa44cffba85278ac820c3fe2c"; + sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3395,12 +3419,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-02-09"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "42eb06b5903dc212acb03f276e6e3fd24f92593c"; - sha256 = "0mh2glx9fmf56znpnxn8y8n185pdl8hxiy00pymc5r2g2q8gjrlb"; + rev = "f7c308e99697317ea572c6d6bafe6d4be91ee164"; + sha256 = "0s48bamqwhixlzlyn431z7k3bhp0y2mx16d36g66c9ccgrs5ifmm"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3419,12 +3443,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-02-08"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "d8073a0e4d19d71da900fb77dcc5f23d72bb8707"; - sha256 = "0f5qzi9kk02z6siqzwz2zak687zb4q2nkg66x3pnnqvhfqazjb5q"; + rev = "65e9ca7fb147668ce3f7321f8d734ae9b754241c"; + sha256 = "1rjmgq4jm7a785qy7xzsxy9hb5x2c3rjiqmhdqmqn3kw1d01wrxl"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3455,24 +3479,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-02-07"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "98dc2dd3a2a07c251bcbd43048157aa56f901402"; - sha256 = "0c3q0ggw0qdi5b0mcvksps0v76rk6p7vcz1dg6c4y67irfjsd21p"; + rev = "016a20711ee595a11426f9c1f4ab3e04967df553"; + sha256 = "0y3rfamhl04hx3cjh6p9spr11flxr3l195a5h9h06k9hhj5rqppc"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "b993af2bd38a60c815768c6ddb250010ed8a1a4f"; - sha256 = "0bwmink8j8pgnxs2csskcbry46h5hl5iaqcdmm6c01ds6dcj1wql"; + rev = "5addafcc2460c7b805f14f8a257b804527bb85d7"; + sha256 = "0whp6gcg059wygpww8mw1gapjd8qgx20xzy5r3g173x0c05kx3a1"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3575,12 +3599,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2021-09-13"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "6595a540a3fdf3d2a65ff18b3bf157540dc2602b"; - sha256 = "1186fbfhpb9n8cp79xbgq7q6a5sgndaldadrhshlq0nm3ajwv6v9"; + rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; + sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3599,12 +3623,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-02-08"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f2ccb9339c979968b19db48b5f8b31c6f0ee7481"; - sha256 = "0f7yw2mjdimmi70liya75wnbbrk37xi2sncpsg0awh15sibynq05"; + rev = "e36464080b7a62fe318f659cca3adb57e6712511"; + sha256 = "09l5dz6ihnzgw7hg87jckmx8ycppsbpls5lcqvamnfiy2j21rhjq"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3647,12 +3671,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-02-06"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "c073406d58472a6c98206a05307d108a5a727e61"; - sha256 = "0ymg9gbw7a6k1lkm1w789z3vp5pzmwjx2vsm5n00jsz5lq8sv5l0"; + rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06"; + sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3983,12 +4007,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-01-25"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "c8a320359cea86834f62225849a75632258a7503"; - sha256 = "070ji1x52hj0xnmxhdncwq78fybpsvak6b8bdy19rf7grg3ddrzk"; + rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0"; + sha256 = "1pr9hxy36xm8gbl4kkq0sa7qn6ki8k5mkdlz07vizk44yzq1pk95"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4043,12 +4067,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-08"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "d3473a9bfdebbd042428d895c84545bc85124159"; - sha256 = "0ahijwjp21v79svgx44dlx5x69g6nh0qv9xi0x9markxj86660yz"; + rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf"; + sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4079,12 +4103,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2021-09-20"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "0ab419e93f4256baed77229548195402e170afa8"; - sha256 = "1gsf5d610slh9cdy6i52fh0k98m5b7xvzp35l6cq008acgsvh575"; + rev = "5973e801e7ad38a01e888cb794d74e076a35ea9b"; + sha256 = "1mbx2iw4s0ny89siic156y7lwypw55abkvskmzzjjf7y4h8g9rsv"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -4163,12 +4187,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-01-15"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "f9c5f0fbda3be77dce5bb4b06b49d9f11b3b6c20"; - sha256 = "040a2nq4piqzc7jdgzxcd495yc7d5a52lwjg9c4m6j91ykz3f0jb"; + rev = "f8671f783baeb0739f556d9b6c440ae1767340d6"; + sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -4235,12 +4259,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-26"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "90e616ac6ee2363577cc54f87c50dd958c2e32f9"; - sha256 = "1x87d69fypz0k424xzd8vy1x4lwhgb8hkmc7mybl4bqfdwi00fhr"; + rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85"; + sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4295,36 +4319,36 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-31"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "498b99c87a5826bfe4409883831deab91ebe296f"; - sha256 = "1bhbk87wrjyk8mvg9aqspag58sz9chhrxvkhblpy2qypgla0s9pk"; + rev = "1fdad275596f85bdc36c525b14697ff3a4f08bdf"; + sha256 = "1pq32gnpmkyqaxq0j5bqf6ik9vkrf2zkayvcvb6fv4vxaiv7w7hr"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-02-02"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "300e13d542359213952bcaf7ffa22a976fe0a739"; - sha256 = "15l56b9hbwymvbg1mk12i5a34fbrgpdl53nxrnh7ra96is2g2gyx"; + rev = "35b910263c614257dadc76813c9a02659912ad62"; + sha256 = "1mbxdxk637x506xdhmbybvzl2ilmy25wdd1911119s257zjq41w0"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2021-12-01"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "be7f06308bddd493d436372ee71d6b366af97fbb"; - sha256 = "15f5alvp8lybyijpjp0h4ma7wyy5pgki4i3v88dwlkvd7gznjkqx"; + rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0"; + sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah"; }; meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; @@ -4355,12 +4379,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f8f3932fb2abaa22e2536b5ac6ef1253a76647c7"; - sha256 = "0h5q16i2n1rssml9ws5rvkmg9gslsdfw69asdq6rmr11w5kihyf9"; + rev = "4dd4df18d415d59310ce8e7a42f707edf6e6d270"; + sha256 = "08m6mxanf31269ray76fzfb4il9cixnf78qq9p19i330k2hydqap"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4403,36 +4427,36 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-01-14"; + version = "2022-02-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "97e454ce9b1371373105716d196c1017394bc947"; - sha256 = "1qdnrrchs463bjsrx5rg61527b0az2f1b929ak9lm0p1r11wgzsw"; + rev = "784398a8f184431fd4329f20b0e4f52e87707bbd"; + sha256 = "14cd1aq5kyi82akkmk3pf2as0pg9kmyavggpcpkp8cl1api01xl8"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-02-01"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "5f34bccc232b687309b32b53bdf1aab73beeec2b"; - sha256 = "0jds7m7l5d75yi8y1rwrg3zbrjy98bayr8ryv83haqzh36y3wwff"; + rev = "6c6962d51dda76cf9bc1467aa8b09036396985d0"; + sha256 = "07ynvj0m88l8vbzvk8izqbwxs4wr99f99wh7x95jpi4wd6rfdvc3"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-02-09"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "aaa160d4423c6c0029f91af85a7e1f092b1aa966"; - sha256 = "07n78gwj8q7mnw6rnzsmnl6cl51g5harrzn2g3fz6rhpr2f1hlwz"; + rev = "2558ee1d3a0c518301bd9bee97ddd61eb21b629c"; + sha256 = "1kjn0fvmbk5ii47vjmw8p3w7h6gdhmxr10x84x48spaz428vw5wd"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4463,24 +4487,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-02-05"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a7fea2ca9f29869c75c3e2ccb683e7740868ba8b"; - sha256 = "182w3ms4j9fvw0h0k2q019a5yxjg3hn88yybwk4r27l1mc54jycb"; + rev = "13d64460cba64950aff41e230cc801225bd9a3e2"; + sha256 = "091argbivsnjp3ibsnci2qj5jrr2b39gicrlz2ky41kmb4pmw36b"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-12-19"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "796d45f0ac89b9e5b6d41fb2c1fada25c1aba870"; - sha256 = "1aadind1zxca5grs9jsawqsvkn9ijvxiqdw9v9jsq861xihsw9wl"; + rev = "b3671ef7a74912575d84b4dbc848fd3b6195b27e"; + sha256 = "0p6959z8im5r1mvr0fmx1ig24kav9wndnr50r1pvq117ch9kr59z"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4547,36 +4571,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-02-04"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "ee39d5d570d07161e16eb73054c295c6561eb2b4"; - sha256 = "0ybh21rzmrvs0njwdg0kw6rlbwhaiwkq41gj8iban7nrfn36vydh"; + rev = "9fcff6e02e1a549d47a2c559a4b833798537c0bc"; + sha256 = "1ai71s38dcny22wmhw5b5b82hj2mf16g60rbzi7llg54fdlfp92k"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-01-11"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "ae3b003af6c6646832dfe704a1137fd9110ab064"; - sha256 = "0fyqhmm0l6hil2hdfwrhsabf5k8c3r5ivghgdv4g5hd8hpcncnj8"; + rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5"; + sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-12-02"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "fb176ca8cf666331fcfa75b7dcc238116d66f801"; - sha256 = "1ksn4k2bhrc588wximrgc6z9pghvwmbkvls1999nvykzrkcpggmd"; + rev = "7f82fec9a1c7fce292c9a9a7310e7d121607db93"; + sha256 = "1x9y74nvcvbwakvlzz4k7h1azkldphmdygwgs5cz7qf9pxbx67lq"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4643,24 +4667,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-02-07"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "60ea878d3f25155f8bcccc2a2f86393d2fa2ee10"; - sha256 = "1ii7ajxcjznq030q7xydx995w33whb88vwbijsihmgd3dcakjr4s"; + rev = "0f20213a9d55ac7ff19b4f9a9f8812303ec4200b"; + sha256 = "0fvmnwraxzfwm9rc4b279bg40ycmpkxjgx6yqkwg7aznzmmqlc22"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-01-14"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "da8afe575527af4c0b43c2ada8070814f79b143a"; - sha256 = "1162n135997ph18d7j1zk6a2nd82g17a5vf4izzrcm7dfqg9xx9i"; + rev = "2a883d68b93570a66baca5984e416d4c4d079c3f"; + sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4691,60 +4715,72 @@ final: prev: nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2021-12-03"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "03b678e5cb293d0e952a649fce3cdba02424bf57"; - sha256 = "1bfw8s3z9nj1zxixrmnqgcqbgjil00y8isiq2ipw3rrcprxgkmix"; + rev = "26bf7cc5e1942dac9f825dff90e180620c264fe7"; + sha256 = "0r45lda81khhkkqk6nrdqw6y3hdzc0w5jirz1yn1n51b7vxjm1dy"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-11-13"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da"; - sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z"; + rev = "29ca81408119ba809d1f922edc941868af97ee86"; + sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lightline-lsp = buildVimPluginFrom2Nix { + pname = "nvim-lightline-lsp"; + version = "2022-01-06"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "nvim-lightline-lsp"; + rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8"; + sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6"; + }; + meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; + }; + nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-02-03"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "8da4d0e14a40e616a73a358f516794cea0fa31f1"; - sha256 = "06h5mq4jq0i15lvwbjbg4cv55kdva8scvad8shc29bpcampq162d"; + rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8"; + sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-02-08"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "337e4fa31d88e5553edeb05ac572bacd4a24d867"; - sha256 = "1xa2zxyqfgzp4zjccrjnj9djdb4f4i9gr2m4gxa6cqz01b21xwmq"; + rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66"; + sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-02-06"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2008c5cebf2b84c5e5f8a566480b022ab2e7ebab"; - sha256 = "0698i51s6dgcanw1iz9zhb8hk6ls2zrvas4i8sqpw7jwr9vnygah"; + rev = "470569379d708e6c8f33f082497e0374067c6fee"; + sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4763,24 +4799,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-02-05"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "ffd1a3bc198b168b9bb5e777b26f11d8fa864a78"; - sha256 = "00lzypb2zrpr1w9jyiw4vad3sfr4ki4whgpg8cr5m9qzamwr87bs"; + rev = "e9553362f1bff508fa947fce09bba297cfac0f79"; + sha256 = "1k3bprxzn3qqm4a7rz2l7pld2am9aggcmvrrr6ak7aafd14v5fs9"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-02-09"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "841021836ee00e7da6dbad819508e384f4e2362a"; - sha256 = "1qjwyicpvbp8396lby62jd9fj8yh2dak5kk1vf64ppjvdf038hpd"; + rev = "d859891e4bff9729ad6e63bd4aebc51946de8786"; + sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4799,12 +4835,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-02-09"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "27f3176b950dc803b61c29bd007e140c232544e5"; - sha256 = "1b4s7vcr1d2d6jnkbsnybc55fmwgk52cdfqsm8x5m37fbwn4k6dq"; + rev = "57093e9f3749c57f20f49d7e10be9c7d15018c86"; + sha256 = "03slk1lbgn2r66hw2gh34ja1l8kjx6qwc6p0g18bd7w1aazb3g9i"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4823,12 +4859,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-01-20"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f9b4b79a20b802b46049dc9cbf19ef6493b551d4"; - sha256 = "0mx5l7vaj99ibzsvk2nmr17g43jyql6jqfwkmfn77h15xyjdp1sy"; + rev = "b6d26e21573c25e9c5faca69a1f905abe66fa294"; + sha256 = "1qsqkgs22r128jb4lvadzv15dzn586x300fwgimkl1q464cdawmx"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4847,12 +4883,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-01-30"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "9842b5fe987fb2c5a4ec4d42f8dbcdd04a047d4d"; - sha256 = "12ww1yqxsk6qm6cimgr0ljgc98n831dpm711q4xqg9c6wm0pyzg7"; + rev = "208d983e9bab4d0eb98b4642636e1b4f41c5280a"; + sha256 = "0yq7whrlzrwiyk6xzakvrf9drrr21gy2s5318rnn9r01mp27z6in"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4871,24 +4907,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-02-09"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "b54de4b48a2e0481da8fc502e6e2a5cf5e4b0ba2"; - sha256 = "0svlmm58w8c6mcqlx8gb47j6sn0z2i4rx9fpgihhhkk7pvjhinwc"; + rev = "48e76bc0317de95ac154ae3a26193bf8881340a1"; + sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-09"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4990db79a87f49e56a3a1bb8507926ebd52ec4cc"; - sha256 = "0c2wpk1bc3ga1m54s4kjmlskv3l2rkgf83xj1alm1rfgzwhl38vv"; + rev = "18c558fd92b5ec800f976c447452ede4e96e9de9"; + sha256 = "1f61237najb65r48j1hsrs6l5yvz9101s0fzi0jpzy40xs0gqb7n"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4931,24 +4967,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-02-07"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7"; - sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7"; + rev = "e23fc8ac796b722dd30f40467d59581d4854c692"; + sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715"; - sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m"; + rev = "178e40a213eeea4810cad440b6be56ceeb6af434"; + sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4967,24 +5003,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af"; - sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga"; + rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d"; + sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-02-06"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "e3294f687626b40754bb40ac2d636d166098b2fb"; - sha256 = "1lajkfxpky4f9bprgbsik6i9n625rbq6gpazfhwy8d9dp0g7c5m4"; + rev = "4415d1aaa56f73b9c05795af84d625c610b05d3b"; + sha256 = "1n2301a0jxf2z79bc5hp97r48vsh25hy9bfrx12my6ag839ayyyj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5015,24 +5051,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-02-06"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "07da9b402a3a31659cd0418d0a84dba0b1b8dbbf"; - sha256 = "1ccsbx9s7ic85mj1ls054vzw9isi7pp1caf1cb7ki5p79sr0drxi"; + rev = "bcc89cabb4841134c9aec66480499ccfac0331d6"; + sha256 = "1h350dwl73qdkyyc9nzc92grg858nardspisc49zv1dc3b9f34bj"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2019-10-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; - sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; + rev = "9b819574b63bbf8883e32602915da22ead08bf9a"; + sha256 = "084wnwmf67bs9ky1sj23fd6sqp27svfxg8gcf1fng8xjf5yk6pdw"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5063,12 +5099,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-02-08"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "9b7902d28c6d50c481e5b46209ef0ebe5b78990f"; - sha256 = "1gqrr9kc7l3ibdwacmfwqz7vb80wdrxzsv73g59l8vhp3q6m7q7a"; + rev = "3a393b404e7066a86afd1652f5be7c8074ed4030"; + sha256 = "02ldc51k5agn9pjqzjbycdjyilz3v04c534wf0x2nsdi97ikf5vl"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5111,12 +5147,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "579f0a552154677ebe5a2f4a7e97f551967da998"; - sha256 = "1g9zbylx8dvall19yxlymrqqp6bk24h5xs3z5a5i0dkwjvnaxx8v"; + rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205"; + sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5159,36 +5195,36 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-01-27"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "f339a7f87e4736c0a3e0db563b8c3cb45fc00a61"; - sha256 = "1raicj3h524csqivw9x3l6znx5y7dwfn3cmh2hzddfy0n7n1mph0"; + rev = "6c8ec4e95755c0375c912c1f9cd1171e5fe23dec"; + sha256 = "0s4j6j6v6fy7zn1b5zm3di7yxcpj1hm352379hsmah02a3h9jv1d"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-01-25"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "139bcf19837213d4e5d541b46f79390a75e84701"; - sha256 = "0siir143hkw87dzkmm64fdyq3raqd9k50wppjafnvdz6i1pgb7nz"; + rev = "10de4d0d50ec1d4d26118c4aa067a9d09e370c9c"; + sha256 = "1mhhff6knqqq6pgmd3w6vfljcig37yyxvmrvhb205y67igy3vcr2"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-02-09"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "8551feef9030edf364188c26a6db797f827cda77"; - sha256 = "060wjn7l518fhg35jqvx0m526qkvhrvc9n778hb3blnm19fj7p55"; + rev = "963cb58c3dd15699c801baf3e64393c6795b62e9"; + sha256 = "0pq9c2xdhw7pshv8xsmrdachsfc4kr3n705jxhiqm95ml6c7fm5b"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5279,36 +5315,36 @@ final: prev: plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2022-01-29"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "32428a7b7bc1f1f4efe54490c212a7bda5dd073c"; - sha256 = "06jxfr484wa563hs5qj2g4i37a6mfdvdjdn7a72dmbqzismvzd48"; + rev = "660bbb1ece1e654b2176f76ce0689304c5a4a025"; + sha256 = "05xf36np8y0gdcd05nzmkawh131lp4mm5cjgjr1byr8cjyl1idr3"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-09-15"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643"; - sha256 = "1y4dwbs40qn942x0hd93yrk04yiphy73b45vcjrknmxq9szhvhk0"; + rev = "9df82a27a49e1c14e9d7416b537517a79d675086"; + sha256 = "1hhrcsrgcy3vqxn9gsm68r77n6z5bw4cr0r47darffan5rxykz21"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-01-31"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "e86dc9b11241ff69ece50c15a5cdd49d20d4c27c"; - sha256 = "1yfiqkvk71i68hha2xdikfmch9qkn0di9gl14x4b9snvcf6l9plh"; + rev = "2a278c8a12a399e25b78a43ebcd4f3996cd4e4b6"; + sha256 = "1z4mzm1bykyp82598cdxps3i8g68bzkfnc8ffr3ajmlcf0ylj6aq"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5605,24 +5641,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "1c77bd656b4802d890ec3382e438e45109e2b862"; - sha256 = "0s1zhrnrkzb1xc3mb95930w31kad0vwff78z8ag2liawq10s2yhb"; + rev = "85e3474449967d2ee4377fbb9633f21093a80187"; + sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-01-31"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "941a36e99bccc48fa9569a03b02ec95fb9c5222c"; - sha256 = "0w0n3210c3j2jpvx0jf718in5hkj7vczv9n1qnls2f46ljwl1f5a"; + rev = "dd2bfa41b2c43d65f1f715e07acf1f1d34b37de8"; + sha256 = "19w9v3blnr6x8sp2v362s7yq9yrcgdhkh5r18zkf75fhinaaivra"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5749,12 +5785,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-02-05"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "3962fd333e729ecd06639d220a6a4e99fb71151b"; - sha256 = "0h0di5ibnlxiwvvqwqfz3zykc8mqg1w8vhd1h04r4626ira7s5rw"; + rev = "9e28459c1f92de3341d70d6e9bc3ad76990e90ad"; + sha256 = "0p5w2sy2393k3d9phr8g1nafjccg1183gxkwqsibk6pr0qqsy2wd"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5797,12 +5833,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "73c15bf820f1a94b3f1e52484ff102667bc1f987"; - sha256 = "0n2q41k69ljca5vj2kapgwffrxk478lgd7l2yg8rsd54jsav5w7q"; + rev = "7cb75a0e0262244728079a5482f2208b742245f9"; + sha256 = "1ik61x58raln6wailp07w4c34bdzjchsrs4vwdi3pa6xlflw4sih"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5917,12 +5953,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2021-09-18"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "56296bd82973139e6fc394689854b959e35c7cdd"; - sha256 = "1x93bnrywypqlywj5f70y5aaici5yqlpky456w15psfs84piyil7"; + rev = "ab20cc8a6a7cb95679f99bc4ec724544f9b94c62"; + sha256 = "01slcxzw485ik7mszj97x67576yw1l7i6imv3rfdn3cv7d216rj8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -5966,12 +6002,12 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2021-08-24"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "1c1ef6dad577e8c5fb7d94ec3b6d698b68e7730d"; - sha256 = "03wy3apmzbrjxypq2xv1z71xnx7bkvhyarw5w1y3l8gl430vjmgi"; + rev = "1b88c3a67948b446720883ed8eadb8c2b83a21ef"; + sha256 = "0m0kkc75ifg7lvk8p3vgq5iy8hr254ywj7hhjgxwzm2zbrwkr04s"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; @@ -6014,12 +6050,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-02-09"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "73622eaf3764237d32395b2b589fa9231eb44b83"; - sha256 = "0xd6kzc043bmf27bs653d8q8vkdlr33ja0k63vmikz9vk91w3czb"; + rev = "5f9654ddbd828312af7f55202e5ecdc0ff4d6a8e"; + sha256 = "1lgn7jb0dq5ri9izwwzsgwkldq71a43j3c6imyz562q51xcb4mgq"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6036,6 +6072,18 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; + space-vim = buildVimPluginFrom2Nix { + pname = "space-vim"; + version = "2022-02-15"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "space-vim"; + rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e"; + sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs"; + }; + meta.homepage = "https://github.com/liuchengxu/space-vim/"; + }; + SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; version = "2021-04-07"; @@ -6072,6 +6120,18 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; + SpaceVim = buildVimPluginFrom2Nix { + pname = "SpaceVim"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "SpaceVim"; + repo = "SpaceVim"; + rev = "6975374b3be303b820c61c2fa33a43fe157265ec"; + sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n"; + }; + meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; + }; + sparkup = buildVimPluginFrom2Nix { pname = "sparkup"; version = "2012-06-11"; @@ -6207,12 +6267,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2021-09-01"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "0290c93c148a14eab2b661a1933003d86436f6ec"; - sha256 = "0n4axfzb6wngklygwbfi1l1qv1d1zgkxhn1wp9fcb8mxg869iwv1"; + rev = "6bffe36862faa601d2de7e54f6e85c1435e832d0"; + sha256 = "147ql1wpg543lyglhx47d79qii6d0dxw0vjwpwzvbxzrnwi50d56"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -6243,14 +6303,14 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-02-01"; + version = "2022-02-22"; src = fetchFromGitHub { - owner = "blackCauldron7"; + owner = "ur4ltz"; repo = "surround.nvim"; - rev = "549045828bbd9de0746b411a762fa8c382fb10ff"; - sha256 = "0dw10lk7vd2axdd8kf532x9q5hrj6b8qcazni456qy2vrbipyx2x"; + rev = "633068182cf894480341b992445f0f0d2883721d"; + sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i"; }; - meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; + meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; sved = buildVimPluginFrom2Nix { @@ -6292,12 +6352,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-12-09"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "034792838579c4b1515c8a5037aba58ecd1d9b35"; - sha256 = "0h5n03sk89pv4cnlyfvf1sfdp2d7ja43nbdcd52s6lrazkqz204g"; + rev = "758944ebc6919c50557b6eb3a52bc41187041fe2"; + sha256 = "1qsa1i72h1vq7mxk8dd75786a1gjncc3jafc8gv5lajk7xyqc64j"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -6466,9 +6526,9 @@ final: prev: owner = "GustavoKatel"; repo = "telescope-asynctasks.nvim"; rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; - sha256 = "Ow7iSmosMs/hGEfnKKorZhS4tKVKal+pkZ52LIFsEu4="; + sha256 = "1vhjdj0jqxlyj6lmysjalnsbh5365fm2irs733hwycicd95f43iv"; }; - meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim"; + meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; telescope-cheat-nvim = buildVimPluginFrom2Nix { @@ -6485,12 +6545,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-02-09"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "0481789b0ba59d0b13f32a33f6b1b844f829f412"; - sha256 = "0mnxy4fvk2n5qqvqhblnflyqzjd6z8w9ifnajfilzzrdfbny87jf"; + rev = "33a8785dc0d0a5fdd243875eba48bfec95e2cebc"; + sha256 = "1zf4x7jwy0p52nq2yhzap9bi8kc4npbdvxs6gbwy9kd1ddidfrkb"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6509,12 +6569,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-02-03"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "924f5ac716bed3bb9cd933a3c96aaba751ee81fd"; - sha256 = "17l0idp0z9h9r3svjpcy0rvmhgddr6pbsc4d2v4hqp3qkazn32ha"; + rev = "d06fe1d4ade68ba17739025e55e941f9e977d37c"; + sha256 = "1rvcbbr3bw1i3xykk519m67kw4qkr5x6j7nml5b7camlcdva6lih"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6533,12 +6593,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2021-11-24"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "b8662b076175e75e6497c59f3e2799b879d7b954"; - sha256 = "0wj7ip9c17m4ij9sw5rq1bqy5hb367b32iz9b14pgg110cvfgpw1"; + rev = "8ec164b541327202e5e74f99bcc5fe5845720e18"; + sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6616,6 +6676,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ultisnips.nvim"; + version = "2021-09-26"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "telescope-ultisnips.nvim"; + rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; + sha256 = "0333k3m0fygc4r7w56csf0h282gf2wqrykl52n6310i9vardyqw7"; + }; + meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2021-08-12"; @@ -6642,28 +6714,16 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-01-31"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f262e7d56d37625613c5de0df5a933cccacf13c5"; - sha256 = "0gi31w0rpd14zmnnc883hji7vf8hi1njdprhm9lk3n6pslipgfmv"; + rev = "567ec85b157f1606b500a0f755181f284810a28e"; + sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; - telescope-ultisnips-nvim = buildVimPluginFrom2Nix { - pname = "telescope-ultisnips.nvim"; - version = "2021-09-27"; - src = fetchFromGitHub { - owner = "fhill2"; - repo = "telescope-ultisnips.nvim"; - rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; - sha256 = "h2PfstopgjCMFYVOnzEX7gkkIHCamcJPJux5B+qYYww="; - }; - meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim"; - }; - tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; @@ -6808,6 +6868,18 @@ final: prev: meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; + todo-nvim = buildVimPluginFrom2Nix { + pname = "todo.nvim"; + version = "2022-02-23"; + src = fetchFromGitHub { + owner = "AmeerTaweel"; + repo = "todo.nvim"; + rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a"; + sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b"; + }; + meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/"; + }; + todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo.txt-vim"; version = "2021-03-20"; @@ -6823,12 +6895,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-01-26"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "d2ceb2ca3268d09db3033b133c0ee4642e07f059"; - sha256 = "0ijmx8rsf8v4m32044bfzprlmbsnlphjcrzvh3jryf6sc58spx6k"; + rev = "981e207e17ecd8bf065b5b9201c1d6d2395e9338"; + sha256 = "1dki7g3q7qp9fmp48h1zi5pyhvn9i6ypqnqhn7n721wsf01mzcrv"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6955,24 +7027,24 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-02-05"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "2a06971ba1a5b3b4c0cbed996feb20d5662fdc43"; - sha256 = "06zc93rw2bkpdi8kli9wfw3h8br1kmfqhhqrdc1b0bjw1zcawwxh"; + rev = "ca21d30c7a72e0e18ad95f25ded5a5f820052685"; + sha256 = "1zn97bjlhz3izs7dh97w528zlfi91k0pl95lrmr5cz2px65icsry"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-02-03"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "8a01863a8204b2382ec341d0203c4e9665212221"; - sha256 = "0shc1wmkrhivfvgn4ahwmn0ifa57rgjq26qlaljxznjhzsiiqxp3"; + rev = "08e259be24d4476c1ee745dc735eefd44f90efdc"; + sha256 = "154k5wrs0lhx8dj2pqkhfgqk11csa1iw1dshn7n07iq0ab2wkimy"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -7699,12 +7771,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-09"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "936edac04920196b331edf3a056c42e5b926c0aa"; - sha256 = "153503q7rfb58ga3hislhbn98hh7gcycwmdmdq22dagxd16zrr31"; + rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82"; + sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7925,6 +7997,18 @@ final: prev: meta.homepage = "https://github.com/ap/vim-css-color/"; }; + vim-CtrlXA = buildVimPluginFrom2Nix { + pname = "vim-CtrlXA"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "Konfekt"; + repo = "vim-CtrlXA"; + rev = "404ea1e055921db5679b3734108d72850d6faa76"; + sha256 = "10bgyqnwcqly3sxl27np1b690hnj1snqbcvg8pzh4zgdysfgy9xg"; + }; + meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; + }; + vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; version = "2021-06-18"; @@ -7975,12 +8059,12 @@ final: prev: vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2021-12-21"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "10064d526001d98b6454235644e3e586b566f26d"; - sha256 = "07vlg4w9x0xs4xag02pyxram94mvizipwya7p6vg7s3rznj0bipd"; + rev = "db100d536885fb920925eb0bcaf00bac3d0112dc"; + sha256 = "0g0zp9j0gaww1w8w7pdfz71dvs2fww9qwsyafbqljn9img0qdmpk"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -8407,12 +8491,12 @@ final: prev: vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2022-01-26"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "5bd58732be452a32e923179673b94e5f1ed5dc9e"; - sha256 = "0x79nnscv11xdldb26j42w268bfhw9haph03l587j2pm5bnkd9qb"; + rev = "a99054ef98e8fdaefa1315af4649138bcadbfdf7"; + sha256 = "1ila8z90rxsdxgp44n5wms5s3vlx0j0b7svhx0nff66ylfqy3s4x"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -8431,12 +8515,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-02-08"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "237787fe2206f8ebec1293aa5730eef71b04c69b"; - sha256 = "1qr9cf8yk6kjm3q7pgcp2pkbli31x94vgxxzd4xx7f4ssfv8l0bl"; + rev = "6244d1739aad6682c6c1d5db18c846c342af6e3e"; + sha256 = "1w0d93wm0xwg8wyvyzdibjmnd1py343mvvzj911byvnm1b52zp7h"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8503,12 +8587,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-02-02"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "6c19f1ddfb74b3b21f3d1e830bee1d1ed6a72ece"; - sha256 = "0fki0z29zlzckf8a3zg82lzi0rijn85rixrpfhb732880nrn5vbx"; + rev = "c29ef11cd6478da675678265e76f9e527843876f"; + sha256 = "1mfskzmpkb7nk1y7szld46npp0r686whrw08iqih7saxbrhhkdra"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8599,12 +8683,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-02-02"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "d845704e9e60e974f7708b9b1e54ab5cca6d9454"; - sha256 = "0gf447qhmdy3azkh0in66awpsk7jwa1bp0ivg4afigylq1s30x76"; + rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835"; + sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8647,11 +8731,11 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-02-08"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f7a4509fc1d1434daf922894f0aee140c9fa3f1a"; + rev = "05f97b7fb130cf137b129dd4f9ab09fa5a8839c8"; sha256 = "1g0v9miazm9z9nbi3s8k5imh75kp4d1mz5q95y2aqm12bi5a7890"; }; meta.homepage = "https://github.com/fatih/vim-go/"; @@ -9201,12 +9285,12 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2021-08-14"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "d522829d810f3254ca09da368a896c962d4a3d61"; - sha256 = "04x6y9yp5xlds37bswmrc3xlhhjfln9nzrkippvvhl48b0kfnpj8"; + rev = "cef9d62165cd26c3c2b881528a5290a84347059e"; + sha256 = "0wkjyqx427vvjhj0v3vfrg4hfb5ax5qq5ilfqas9h94w1cngiz5c"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -9261,12 +9345,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2021-09-22"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "5461c6911ee4d61d1f729c66cd3514905203be34"; - sha256 = "0k2l8z8qkjqj4swwzlc0mf1r77n1rxi5skxwlvvwcldx0gh0mv4r"; + rev = "9a2120d9f98b13b3aa37b577a7e769bfdd046130"; + sha256 = "01myc1pbc1q2fkxcy40pibbqszjxvkc9diwjmixfn4a6qmf8n1gp"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -9369,12 +9453,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-01-15"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "66b56c026fa24f76f38d3bc99bd478eff9aa4be3"; - sha256 = "0bq0h3wla97jfvvkgw5ylmfyj4jbxml6y8gl2abnanwb3ympy3mb"; + rev = "3d0fc4072bef08b578d4a4aa4a6f91de571e99e4"; + sha256 = "16cpi5x2z1gqfzxgvdnqh47g6p0b6dmhrrfqprmc45c6cfwj6plh"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9441,12 +9525,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-02-09"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "b4dc23e2b0c4ce1ed77eb630bf04238ee2871e2e"; - sha256 = "1b4dz229a5qlfdigc4h0chrdb368bkskq11g6a6mc0fhnzm20j1i"; + rev = "95e90840c45911b62261bae02e3ba2777877eaf5"; + sha256 = "1jrj3419ar7lnj6mriq3pvffsg6g3kxg36jrixi96a0cl2aqrs8b"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9466,24 +9550,24 @@ final: prev: vim-markdown-toc = buildVimPluginFrom2Nix { pname = "vim-markdown-toc"; - version = "2022-02-02"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "70dd06e9358859f712cc7cf40e267fdac93cc7ff"; - sha256 = "1xin3j5ccg6j6ny9la4shknqnk3i6pf7awkg1rgxqlrd4pwcq5pr"; + rev = "31aa38e58334f1321ae8ec6f38d05303f3226698"; + sha256 = "0kv7miavs4xfiaj7yj0hi7cr65m7mn6rvd6dykmbr8j7w0pra7fr"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-02-04"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "0fd7055cc23109f3dbb65aadee664c663a4d5f94"; - sha256 = "0w19jb52xwifiigivard7xxhfp4qjfqjf7fygk7b2bbhbrh1qnb8"; + rev = "7fd8806138f404498db7a3e848d8fa55ad61e7cf"; + sha256 = "061jvw0rdwz7s4yaiq7s32cx0y1vkknsc80gh2gj53jsbcpk30zp"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9862,12 +9946,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-09-04"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "5d152a9e03ca1c975c1f439456376e01561a02b5"; - sha256 = "0zdjj4mhw27jbdw8xrjc2gj3mx65p02c6nnyp7gci78fzxcv7slr"; + rev = "18db93968ae0f2aa89ee68e18f5785381ab169cc"; + sha256 = "0a4261fkvgfaw1vsm5fgqm27rlcx8gpj2hkrk8kg9bjaijniqgd8"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -9934,12 +10018,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2021-07-06"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "5056e635ecf406e65d7d28651bab55600dd18741"; - sha256 = "0mzvknzk42x5h2p3l9gmmxhbardfkrirr8wzfx460cm5daps6j2q"; + rev = "7bea0ba8929749b2a471520af87635163fb28bdf"; + sha256 = "1dqd11qmb5jlkmalp10niysz1c2rv2pzwq332i3incq1v1l5146j"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -9994,12 +10078,12 @@ final: prev: vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2021-06-19"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-pencil"; - rev = "942e02e53cc2d914f215a2c69707fbdbdd137f86"; - sha256 = "098agz8kiycn6nhv42r43dmbc5hng3d7nwk0zgiws7cz8si4kf0s"; + rev = "5b4110dadebb756aae3d852caafbc963bb3c9a5e"; + sha256 = "0f21dabn586643vzkdxcp86ap803vsm60lx2lifbaicrxkf3s7ri"; }; meta.homepage = "https://github.com/preservim/vim-pencil/"; }; @@ -10054,12 +10138,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-01-23"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "2c5af8f89d3e61e04e761c07a1f043b0f35203c6"; - sha256 = "1aajyfcxw7d9dfhakz6jzkhc6dvb6dckwv3q77f5cfnc5s6rfnz3"; + rev = "83422e0a1fcfc88f3475104b0e0674e8dbe3130e"; + sha256 = "1fj2avq18qx6rkghqiyp14qg166889kfpj7hzy5a1n71n5c8lh2j"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -10138,12 +10222,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-01-20"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "8f3519a8c274767ae04134377abf144c75ebf534"; - sha256 = "1cxcnv2y5hmj1a5prddq3909xln26gfh8lhv62yqi5ckmrpzn64v"; + rev = "9ce73e992d4481de6235222b75e42f64d2b307ef"; + sha256 = "09w41jkidlyab67ishjpibbyrpa9qqmcrpb9y91ssyv3mzir5d3w"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -10570,12 +10654,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-25"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "65ade2453342062010386e226eaa754889e2b557"; - sha256 = "005z7l99lp89lwz7y8a2gfrnby3j2macncbpprjfmnwc0f1y9wvg"; + rev = "27156fb69450ddef8e1bbec6afa71896681ad38a"; + sha256 = "073bc4pbsx7s5is6658q5pk0l69ip1bx4dhlz2bcvzhkslzp2ik0"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10750,12 +10834,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-02-06"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "13ad9c4ce43538601eb9b94dae2c55dccb5cab7e"; - sha256 = "1v8g6is8aw0wlfmxypdkdnx2vd53f3k13i9sqyq3kayj32k22cwn"; + rev = "d6098f5603066c438a7bde3cc4acc32fbe6972e8"; + sha256 = "0ycr5h9zng612ia6sx67mrw266wmy6xdbkrc9rrd53lzd1akh0f3"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -10907,12 +10991,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-01-22"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2ace9a12253140f1bdf4318a46ca9076658dd147"; - sha256 = "04bnymydy84z4gqnyjkkddvacmsqccbxiwm8p5hinlnyp6ahjjjd"; + rev = "0422b7fa087eb7dd1270dfcb1f3d634b57829b6e"; + sha256 = "060nvhxj219phx4rxi3igg2lvk39ll8g3jp762nigc242hha6wzf"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11075,12 +11159,12 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2021-12-06"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759"; - sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py"; + rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411"; + sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; @@ -11147,12 +11231,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-01-31"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "0aa467db97a075c576e97424865a57a457fd4851"; - sha256 = "0ds8a0qn4dx332rpfwjmk09iaqjjd7wiqp91j1c84ysjnc2c1pfk"; + rev = "3792283722949045c5218abc3cab151441828afb"; + sha256 = "1fb71npvzdgrwfdgi8m7fzn5an027fcn6s85g0vywjr89l2dqyyx"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11279,12 +11363,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-31"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b6754ace510ffa931bceb47df417a9ef3a87cb6b"; - sha256 = "13dfaf6y0yfnbnxl43fc0jwqv45gigki4iyhb4698fhmcy105jv6"; + rev = "f922f82954cb68fccfd20ad3eacc78fb2559a937"; + sha256 = "1inb0vh1mfg6ihasd317ykw0dsnx8z16jvm6f6i8ldy3fw79y9wg"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11303,12 +11387,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-05-01"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "722aaf34486ffee924ccbc34eb22553642c1c153"; - sha256 = "1vg242139r1arz4kia4bbpmvzr4v5rp7gzy063f61xbvkdjwjx4q"; + rev = "7dcfcc17094eab71fd5fb467eb73c34abdde586c"; + sha256 = "1rs2zhr500ib1drvnk63yciw4g3z1jsfksm6s2a0ywsxv1b240n2"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -11351,12 +11435,12 @@ final: prev: vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2020-10-24"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-wordy"; - rev = "667426a0171787b2620dffa5b2d7c01c9040237f"; - sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z"; + rev = "590927f57277666e032702b26e4e0c82717cc3cb"; + sha256 = "13ky8zlqalbvamhjvici7nvybansfzhrk8h203ayi2s5id9dai6m"; }; meta.homepage = "https://github.com/preservim/vim-wordy/"; }; @@ -11483,12 +11567,12 @@ final: prev: VimCompletesMe = buildVimPluginFrom2Nix { pname = "VimCompletesMe"; - version = "2020-12-30"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "ackyshake"; repo = "VimCompletesMe"; - rev = "2c69e30675d2a30208099742d14bd661d99fc5f2"; - sha256 = "0gjzl0027xjkq0mbqs9grab38ghwnixr57b4wicl113yd76hyb5i"; + rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; + sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; }; meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; }; @@ -11555,12 +11639,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2020-06-23"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "8f40d86ab938d5df8c1c9824320621ae9f0d5609"; - sha256 = "11k59lc31056lk9ndkmi9a4459lnv6hdhvw3y4gpin40xchl6d61"; + rev = "3ba46c01109bc590c6740c1133f53584751924b2"; + sha256 = "05m34kbpi6y4rkcrxz785jikj37y5q44k0wfjdhklr49fgw08vra"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -11591,12 +11675,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-02-02"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "670fb84fcf623c3978fa3d91a7cce8ac8a21674d"; - sha256 = "1f7ibgnzsmakxspzn4xhhscbw9hq61cs3s4v2zr3xawdc5cf89gq"; + rev = "d044dea0c2669c740052a47900e6e16f64444b63"; + sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11604,12 +11688,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-02-09"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "950f9e5ea26cf7f63cd9f0bf71bbae87e70c2158"; - sha256 = "0gc7zh1h60mnds2xgsliblxg951swcnafxxla1w74yjjsn9cmsbd"; + rev = "c8c9ac5377045f3e2881d13cbb60ff1750497b15"; + sha256 = "14bl67020mswbbz63jzq25nl6sqg9qzryw12x1s802xnc2f65g9r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11724,12 +11808,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-01-09"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "f50d79a3f9ef07be3c0c8a0f49faaeea803a8c0c"; - sha256 = "0188kmh2ck1a5254i3gdk1p6p2z7wdq3prj66lslbhyard8gzxjq"; + rev = "f49592d297eff4c485ac28927fc7945c165197d6"; + sha256 = "14sxz4vfzrqwa9qxw9pprj34v7z4gmdz0k1xdkyjcx6fzmny7ycn"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -11747,15 +11831,15 @@ final: prev: }; winshift-nvim = buildVimPluginFrom2Nix { - pname = "winshift.vim"; + pname = "winshift.nvim"; version = "2021-11-15"; src = fetchFromGitHub { owner = "sindrets"; - repo = "winshift.vim"; + repo = "winshift.nvim"; rev = "aaa04b97640165eb0877bfc04943f4282887470b"; - sha256 = "g5v/qd1FNg7mMZif7Liga3BAnZV7Mi7hkqnCUEFk52U="; + sha256 = "0rg7ci0m1hm9jbhjwckvjnfl0w3bl2wfr7wq67k0wdj5vnlzz6w3"; }; - meta.homepage = "https://github.com/sindrets/winshift.nvim"; + meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; wmgraphviz-vim = buildVimPluginFrom2Nix { @@ -11857,12 +11941,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-01-11"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e"; - sha256 = "1g84g4lgpxgyb7cicdz6dxgmp4gliq0633lblcwsya7m35r8c7ls"; + rev = "aec79589040497cd0cb0701e089d8d80dc6de996"; + sha256 = "16nnq95hvprr5wkbrx4slrfjspcshhx4halij3spldrxy40mbm2m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -11930,12 +12014,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-01-28"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "0762d89c24f5a1da6bf26ca83f3719c379008ff9"; - sha256 = "00vfyi79m85d8pv0cnhyj82nqlnwiqs5pkzbr9yn8mvy6r0hscf3"; + rev = "10ff26328cf8e5ed2938b96da6f8c20737eb444a"; + sha256 = "1r50jrap0pb2mah4b7mx9scg2gz03l02bkqsfqw1a0r7rwv6alxs"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix similarity index 99% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index da04fee9c9..bb8e6a50cf 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -414,7 +414,7 @@ self: super: { markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: { + nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: { dontNpmInstall = true; }); in { @@ -820,7 +820,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE="; + cargoSha256 = "12xaxpg4ws09rnp9prrqcac8581ggr36mpy39xyfngjy5xvcalaq"; }; in '' diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/readme.md b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/readme.md similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/readme.md rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/readme.md diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix similarity index 60% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix index e1b727c49e..52a9e741af 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix @@ -1,5 +1,6 @@ -{ pkgs ? import ../../.. { } }: +{ pkgs ? import ../../../../.. { } }: +# Ideally, pkgs points to default.nix file of Nixpkgs official tree with pkgs; let pyEnv = python3.withPackages (ps: [ ps.GitPython ]); diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py similarity index 87% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/update.py rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py index d9adc66674..ad1c38cb37 100755 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py @@ -13,6 +13,9 @@ # refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs +# +# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# import inspect import os @@ -27,7 +30,8 @@ log.addHandler(logging.StreamHandler()) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) +# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree +sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate GET_PLUGINS = f"""(with import {{}}; @@ -47,7 +51,7 @@ let in lib.filterAttrs (n: v: v != null) checksums)""" HEADER = ( - "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" + "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names similarity index 99% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 098530dcf3..ef4d549900 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -18,6 +18,7 @@ alvan/vim-closetag alvarosevilla95/luatab.nvim alx741/vim-hindent alx741/vim-stylishask +AmeerTaweel/todo.nvim amiorin/ctrlp-z andersevenrud/cmp-tmux andersevenrud/nordic.nvim @@ -52,7 +53,6 @@ benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion -blackCauldron7/surround.nvim bling/vim-bufferline blueballs-theme/blueballs-neovim blueyed/vim-diminactive @@ -314,6 +314,7 @@ joonty/vim-xdebug joosepalviste/nvim-ts-context-commentstring jordwalke/vim-reasonml josa42/coc-lua +josa42/nvim-lightline-lsp josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim jose-elias-alvarez/null-ls.nvim @@ -377,6 +378,7 @@ kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold Konfekt/vim-alias +Konfekt/vim-CtrlXA konfekt/vim-DetectSpellLang kosayoda/nvim-lightbulb kovisoft/slimv @@ -420,6 +422,7 @@ lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer lilydjwg/fcitx.vim@fcitx5 liuchengxu/graphviz.vim +liuchengxu/space-vim liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim @@ -717,6 +720,7 @@ ryvnf/readline.vim saadparwaiz1/cmp_luasnip saecki/crates.nvim sainnhe/edge +sainnhe/everforest sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb @@ -772,6 +776,8 @@ sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf sotte/presenting.vim +SpaceVim/SpaceVim +spywhere/lightline-lsp srcery-colors/srcery-vim steelsojka/completion-buffers steelsojka/pears.nvim @@ -887,6 +893,7 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +ur4ltz/surround.nvim urbit/hoon.vim Valloric/MatchTagAlways Valodim/deoplete-notmuch diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix similarity index 99% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix index 128b969c35..4183b62143 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -82,7 +82,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: +The example file pkgs/applications/editors/vim/plugins/default.nix provides +both: * manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/README.txt b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/README.txt similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/README.txt rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/README.txt diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/addon-info.json rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim diff --git a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix index a658f95ac0..b9fcfe1022 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix @@ -50,14 +50,10 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "vis"; genericName = "Text editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - mimeType = lib.concatStringsSep ";" [ - "text/plain" "application/octet-stream" - ]; - startupNotify = "false"; - terminal = "true"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/default.nix index 077c3807ec..cc935876de 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.7.1"; + version = "1.9.1"; }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk="; + name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; + url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; + sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; }; + unpackPhase = '' + runHook preUnpack + + gzip -d $src --stdout &> temporary.zip + unzip temporary.zip + rm temporary.zip + + cd extension/ + + runHook postUnpack + ''; + buildInputs = [ jq ]; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/cpptools/update_helper.sh rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix similarity index 98% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 3e5bf42dd9..5a6545bb1d 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -349,6 +349,42 @@ let }; }; + bierner.emojisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "emojisense"; + publisher = "bierner"; + version = "0.9.0"; + sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-checkbox"; + publisher = "bierner"; + version = "0.3.1"; + sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-emoji = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-emoji"; + publisher = "bierner"; + version = "0.2.1"; + sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -1276,8 +1312,8 @@ let mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.13"; - sha256 = "/MpwbM+obcD3uqk8hnDrnbEK9Jot4fMe4sNzLt6mVGI="; + version = "0.1.15"; + sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn"; }; meta = { license = lib.licenses.mit; @@ -1537,8 +1573,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.2.0"; - sha256 = "sha256-YmR3FWhPZSU2gE6NIVoA1HZBzaYaTNYFXC/uNwbDEdQ="; + version = "1.3.0"; + sha256 = "sha256-Y5hP/Rq9BsFwbCRQWOfiLHKoYkKBpZx8blg9o74obfk="; }; buildInputs = [ jdk ]; meta = { @@ -1821,8 +1857,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.5"; - sha256 = "sha256-nIR3PtbtnSbAU0rS+qVtPsj++Dbfp/k86dWkx4xYcno="; + version = "2.1.7"; + sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -1879,8 +1915,8 @@ let mktplcRef = { publisher = "takayama"; name = "vscode-qq"; - version = "1.4.0"; - sha256 = "sha256-DYjNWSKOrDYvdiV7G24uKz6w4ggeYUMkQIiOGZAbMSI="; + version = "1.4.2"; + sha256 = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng="; }; meta = { license = lib.licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/language-packs.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/language-packs.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix index 09c5c02aee..8d6834dcee 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2021.11.1422169775"; + version = "2022.0.1814523869"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs="; + sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/python/extract-nuget.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/remote-ssh/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rescript/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rescript/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/rescript/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rescript/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index fa08acb84c..271607af6b 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -29,7 +29,7 @@ let sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; }; - build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/terraform/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/terraform/default.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettings.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettingsTest.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/updateSettingsTest.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh similarity index 96% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 44cf506b3a..6fff745449 100755 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -4,7 +4,7 @@ set -eu -o pipefail # can be added to your configuration with the following command and snippet: -# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix +# $ ./pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > extensions.nix # # packages = with pkgs; # (vscode-with-extensions.override { diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 7f20d0e719..c9d4deebdf 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -42,7 +42,7 @@ let doCheck = false; }; - nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps"; in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh similarity index 90% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh index 2fe0cc5cf2..0dc38c6fdb 100755 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh @@ -1,5 +1,6 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix-prefetch +#! /usr/bin/env nix-shell +#! nix-shell ../../update-shell.nix -i bash + set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" if [[ $# -ne 1 ]]; then @@ -12,7 +13,8 @@ FIXME: This script doesn't update patched lldb. Please manually check branches of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. " -nixpkgs=../../../.. +# Ideally, nixpkgs points to default.nix file of Nixpkgs official tree +nixpkgs=../../../../../.. nixFile=./default.nix owner=vadimcn repo=vscode-lldb diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnvTest.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeExts2nix.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/wakatime/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/wakatime/default.nix index 9832b16f74..554b2bddb6 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "17.1.0"; - sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw"; + version = "18.0.5"; + sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 133c5fe9cb..672eb4b27b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -37,19 +37,16 @@ let genericName = "Text Editor"; exec = "${executableName} %F"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;"; - extraEntries = '' - StartupWMClass=${shortName} - Actions=new-empty-window; - Keywords=vscode; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=${executableName} --new-window %F - Icon=code - ''; + startupNotify = true; + startupWMClass = shortName; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" ]; + keywords = [ "vscode" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "${executableName} --new-window %F"; + icon = "code"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -59,13 +56,11 @@ let genericName = "Text Editor"; exec = executableName + " --open-url %U"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/vscode;"; - extraEntries = '' - NoDisplay=true - Keywords=vscode; - ''; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vscode" ]; + keywords = [ "vscode" ]; + noDisplay = true; }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-shell.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-shell.nix new file mode 100644 index 0000000000..aa9488c217 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-shell.nix @@ -0,0 +1,18 @@ +{ pkgs ? import ../../../.. { } }: + +# Ideally, pkgs points to default.nix file of Nixpkgs official tree +with pkgs; + +mkShell { + packages = [ + bash + curl + gawk + gnugrep + gnused + jq + nix + nix-prefetch + nix-prefetch-scripts + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh index 709fbe1c75..67ec7a21b3 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh index 79c6b497ec..377068c082 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused gawk +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 496dbe2496..5e8337f6b0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0gv71l9cidkbbv7b1dsfyn7lnlwcmjds9qx6nrh7alymdm1xa2xr"; - x86_64-darwin = "1is795040xb3l23crblwf056wsvsi4dip3lkwhlblhkpsl0048f1"; - aarch64-linux = "186dy6h3krc6fqvmh1nay1dk5109kl9p25kx37jkbzf2qhnpibm8"; - aarch64-darwin = "04xc5fy4wcplfrigbm624dpzxd2m4rkq979xr1i57p3d20i96s6g"; - armv7l-linux = "1k7bfmrfw16zpn33p7ycxpp6g9xh8aypmf61nrkx2jn99nxy5d3s"; + x86_64-linux = "04lyih67vcf2hficvlv1r25k8k48n9x15sbqrfp1syzhy5i4zch3"; + x86_64-darwin = "0460mh1ah9hswn8ihais5hzvz453r36ay2bb3hy3z1grfs3s5blk"; + aarch64-linux = "1db2r4ja0srya2lw900l4mk24xva00kf7vxajcb7q0rab4cpfr3n"; + aarch64-darwin = "04c43ibbarsqdm1wcsmsi9rnfsl3lyq638d3j0dj94xifk0v61j9"; + armv7l-linux = "1qzi2biy5mjbxdgcakzmid68ykq6vrgj4lqmz0jk3g46r4kpnrgd"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.2"; + version = "1.65.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index b1ab8c57ee..39c04314af 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ldfp4r7nb9npvjadgj63sd369nqmbgf5y4kpp93slsy1lbs0bk8"; - x86_64-darwin = "05z0jx2cc1askzzdxa8vxj8gp0v9rm1jw6005bpmijvyb8s2d30w"; - aarch64-linux = "1a5fyxzz51rb0af0wv3xh2h87yq00y5k501p7idqhj0zvd5mpqh6"; - armv7l-linux = "05byi0aba516whzry5qkxfkm82sy2dgv1m0hyycmnkb2dwmb552m"; + x86_64-linux = "0a38bjkksna7q2lhcm1hgfn189jw3k8svw0jf591bpq7jvknim1v"; + x86_64-darwin = "173rhavczm0k9qgrlz68rdvwsmy3ynq2g14shx9gipchr1i0rih5"; + aarch64-linux = "00xkhwvxmyiyy9k1vh23sqyib584qafzs1m57xraqq3n8098jrng"; + armv7l-linux = "0lqq54hnv4b1m47cya7196cn00jwslcsh5ykicgq0dxljrcawi0y"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.2"; + version = "1.65.0"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix index e7cfe6284e..8734f4d31c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/xxe-pe/default.nix @@ -19,7 +19,7 @@ let icon = "xxe"; desktopName = "xxe"; genericName = "XML Editor"; - categories = "Development;IDE;TextEditor;Java"; + categories = [ "Development" "IDE" "TextEditor" "Java" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix index 11f24d59e5..8b7b1c3262 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Emulator;"; + categories = [ "Emulator" ]; }; in diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix index 438849e7fd..c1820646dc 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { comment = "x86 dos emulator enhanced"; desktopName = "DosBox-Staging"; genericName = "DOS emulator"; - categories = "Emulator;Game;"; + categories = [ "Emulator" "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix index 383e943ff2..87ac444ae4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { comment = "x86 dos emulator"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Emulator;Game;"; + categories = [ "Emulator" "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index e091570300..ce3fb3d06a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix @@ -26,7 +26,7 @@ let exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; - categories = "System;Emulator;"; + categories = [ "System" "Emulator" ]; }; dest = "$out/opt/mame"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mednafen/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mednafen/default.nix index 235386cba2..bcc58ccb76 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mednafen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mednafen/default.nix @@ -15,6 +15,7 @@ , libsndfile , pkg-config , zlib +, libiconv }: stdenv.mkDerivation rec { @@ -31,20 +32,25 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_net - alsa-lib flac freeglut - libGL - libGLU - libX11 libcdio libjack2 libsamplerate libsndfile zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libGL + libGLU + libX11 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "pic" "format" ]; + + enableParallelBuilding = true; postInstall = '' mkdir -p $out/share/doc @@ -87,6 +93,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mednaffe/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mednaffe/default.nix index 4874d5efee..32bb06b270 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mednaffe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mednaffe/default.nix @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ gtk3 mednafen ]; - postInstall = '' - wrapProgram $out/bin/mednaffe \ + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=( --prefix PATH ':' "${mednafen}/bin" + ) ''; meta = with lib; { @@ -32,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix index d8defe6f2e..4424bedc6f 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { comment = "A Game Boy Advance Emulator"; desktopName = "mgba"; genericName = "Game Boy Advance Emulator"; - categories = "Game;Emulator;"; - startupNotify = "false"; + categories = [ "Game" "Emulator" ]; + startupNotify = false; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix index 9b147de4fa..dba83f4130 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix @@ -20,25 +20,15 @@ mkDerivation rec { pname = "punes"; - version = "0.108"; + version = "0.109"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; rev = "v${version}"; - sha256 = "0inkwmvbr2w4addmgk9r4f13yismang9ylfgflhh9352lf0lirv8"; + sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk="; }; - patches = [ - # Drop when version > 0.108 - # https://github.com/punesemu/puNES/issues/185 - (fetchpatch { - name = "0001-punes-Fixed-make-install.patch"; - url = "https://github.com/punesemu/puNES/commit/902434f50398ebcda0786ade4b28a0496084810e.patch"; - sha256 = "1a3052n3n1qipi4bd7f7gq4zl5jjjzzzpbijdisis2vxvhnfvcim"; - }) - ]; - postPatch = '' substituteInPlace configure.ac \ --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 2f68425711..1a2d122e63 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -1,18 +1,31 @@ -{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems -, dotnetCorePackages, libX11, libgdiplus, ffmpeg -, SDL2_mixer, openal, libsoundio, sndio, pulseaudio -, gtk3, gdk-pixbuf, wrapGAppsHook +{ lib +, buildDotnetModule +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, dotnetCorePackages +, libX11 +, libgdiplus +, ffmpeg +, SDL2_mixer +, openal +, libsoundio +, sndio +, pulseaudio +, gtk3 +, gdk-pixbuf +, wrapGAppsHook }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "6e0799580f0d1b473a79471c5d365c6524d97a86"; - sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv"; + rev = "3705c206688c69d3348f5cec84dc480d8d7c578e"; + sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -67,22 +80,31 @@ buildDotnetModule rec { done ''; - desktopItems = [(makeDesktopItem { - desktopName = "Ryujinx"; - name = "ryujinx"; - exec = "Ryujinx"; - icon = "ryujinx"; - comment = meta.description; - type = "Application"; - categories = "Game;"; - })]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Ryujinx"; + name = "ryujinx"; + exec = "Ryujinx"; + icon = "ryujinx"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + }) + ]; meta = with lib; { - description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; - license = licenses.mit; changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog"; - maintainers = [ maintainers.ivar ]; + description = "Experimental Nintendo Switch Emulator written in C#"; + longDescription = '' + Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, + written in C#. This emulator aims at providing excellent accuracy and + performance, a user-friendly interface and consistent builds. It was + written from scratch and development on the project began in September + 2017. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ivar jk ]; platforms = [ "x86_64-linux" ]; mainProgram = "Ryujinx"; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix index 991d00a5a4..804b17d894 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix @@ -10,8 +10,8 @@ (fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) - (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; }) + (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) + (fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh index 0861414f0b..4b5fa4834f 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,40 +1,57 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 -set -eo pipefail +set -euxo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" +DEPS_FILE="$(realpath "./deps.nix")" -nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info -new_hash="$(jq -r ".sha256" < repo_info)" -new_rev="$(jq -r ".rev" < repo_info)" -rm repo_info +RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows | + jq -r '.workflows[] | select(.name == "Release job") | { id, path }' +) +RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id') +RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path') -new_version="$( - curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \ - | grep -Po '"version":.*?[^\\]",' \ - | sed 's/"version":"\(.*\)",/\1/' - )" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +BASE_VERSION=$( + curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" | + grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' | + sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/' +) -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date! Doing nothing" - exit 0 +LATEST_RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" | + jq -r '.workflow_runs[0] | { head_sha, run_number }' +) +COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha') +PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number') + +NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" + +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +echo "comparing versions $OLD_VERSION => $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 fi -cd ../../../.. -update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev" +SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" -store_src="$(nix-build . -A ryujinx.src --no-out-link)" -src="$(mktemp -d /tmp/ryujinx-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -pushd "$src" +cd ../../../.. +update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + +STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)" +SRC="$(mktemp -d /tmp/ryujinx-src.XXX)" +cp -rT "$STORE_SRC" "$SRC" +chmod -R +w "$SRC" +pushd "$SRC" mkdir nuget_tmp.packages -dotnet restore Ryujinx.sln --packages nuget_tmp.packages +DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages -nuget-to-nix ./nuget_tmp.packages > "$deps_file" +nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE" popd -rm -r "$src" +rm -r "$SRC" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix index ca0de2f827..13457823a2 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Emulator;"; + categories = [ "Emulator" ]; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix index ba2f5d6bdc..a14109bc85 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix @@ -9,7 +9,7 @@ let comment = "A SNES emulator"; desktopName = "zsnes"; genericName = "zsnes"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 3de304f586..41408bc330 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -35,6 +35,8 @@ , grass , withWebKit ? true , qtwebkit +, pdal +, zstd , makeWrapper }: @@ -67,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.16.16"; + version = "3.22.4"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "85RlV1Ik1BeN9B7UE51ktTWMiGkMga2E/fnhyiVwjIs="; + sha256 = "sha256-z2dCdaIJUKpZgJHtn1/qA07uMJpAWKL0cDx6B/n1Oxg="; }; passthru = { @@ -108,6 +110,8 @@ in mkDerivation rec { qtserialport qtxmlpatterns qt3d + pdal + zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; @@ -126,6 +130,7 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DWITH_3D=True" + "-DWITH_PDAL=TRUE" "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" @@ -138,11 +143,11 @@ in mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ grass ]} ''; - meta = with lib; { + meta = { description = "A Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ lsix sikmir erictapen ]; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 816368bbab..9658cfe060 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.22.3"; + version = "3.24.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "TLXhXHU0dp0MnKHFw/+1rQnJbebnwje21Oasy0qWctk="; + sha256 = "sha256-EPF8sXAH7UAttLutxXGFovog3+XpXP0GXg2tu0mSU2s="; }; passthru = { @@ -148,6 +148,6 @@ in mkDerivation rec { homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir erictapen ]; + maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 19a754d92e..7a8cae9bf8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,9 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif -, potrace, ApplicationServices +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libtool +, bzip2 +, zlib +, libX11 +, libXext +, libXt +, fontconfig +, freetype +, ghostscript +, libjpeg +, djvulibre +, lcms2 +, openexr +, libjxl +, libpng +, liblqr1 +, libraw +, librsvg +, libtiff +, libxml2 +, openjpeg +, libwebp +, libheif +, potrace +, curl +, ApplicationServices , Foundation -, testVersion, imagemagick +, testVersion +, imagemagick }: let @@ -11,20 +38,20 @@ let if stdenv.hostPlatform.system == "i686-linux" then "i686" else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64" else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" - else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" + else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else null; in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-25"; + version = "7.1.0-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc="; + hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -41,18 +68,30 @@ stdenv.mkDerivation rec { # let's disable it for now to unbreak the imagemagick build. ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" ++ lib.optionals (ghostscript != null) - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + [ + "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM - ; + ; nativeBuildInputs = [ pkg-config libtool ]; buildInputs = - [ zlib fontconfig freetype ghostscript potrace - liblqr1 libpng libraw libtiff libxml2 libheif djvulibre + [ + zlib + fontconfig + freetype + ghostscript + potrace + liblqr1 + libpng + libraw + libtiff + libxml2 + libheif + djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, # let's disable it for now to unbreak the imagemagick build. @@ -66,10 +105,10 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 ] + [ bzip2 freetype libjpeg lcms2 curl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] - ; + ; postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix index 8b482626c9..0b70d67b27 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/antimony/default.nix @@ -48,13 +48,9 @@ in genericName = "CAD Application"; exec = "antimony %f"; icon = "antimony"; - terminal = "false"; - categories = "Graphics;Science;Engineering"; - mimeType = "application/x-extension-sb;application/x-antimony;"; - extraEntries = '' - StartupWMClass=antimony - Version=1.0 - ''; + categories = [ "Graphics" "Science" "Engineering" ]; + mimeTypes = [ "application/x-extension-sb" "application/x-antimony" ]; + startupWMClass = "antimony"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index fede2c9bb5..55080f333c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { icon = "avocode"; desktopName = "Avocode"; genericName = "Design Inspector"; - categories = "Development;"; + categories = [ "Development" ]; comment = "The bridge between designers and developers"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix index 2518eb0942..be8e00b515 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix @@ -16,8 +16,8 @@ let exec = "evilpixie %F"; icon = "evilpixie"; genericName = "Image Editor"; - categories = "Graphics;2DGraphics;RasterGraphics;"; - mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;"; + categories = [ "Graphics" "2DGraphics" "RasterGraphics" ]; + mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ]; }; in mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix index 18fdc2c55a..77ffc4b44c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix @@ -26,20 +26,15 @@ stdenv.mkDerivation rec { (makeDesktopItem { name = "fiji"; exec = "fiji %F"; + tryExec = "fiji"; icon = "fiji"; - mimeType = "image/*;"; + mimeTypes = [ "image/*" ]; comment = "Scientific Image Analysis"; desktopName = "Fiji Is Just ImageJ"; genericName = "Fiji Is Just ImageJ"; - categories = "Education;Science;ImageProcessing;"; - terminal = false; + categories = [ "Education" "Science" "ImageProcessing" ]; startupNotify = true; - extraEntries = '' - Version=1.0 - TryExec=fiji - X-GNOME-FullName=Fiji Is Just ImageJ - StartupWMClass=fiji-Main - ''; + startupWMClass = "fiji-Main"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 89db615da5..12e605f80c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "473"; + version = "474"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-eSnN9+9xJ1CeJm/jWw4jZq5OkgXC0p0KmxQ8bhnp9W4="; + sha256 = "sha256-NeTHq8zlgBajw/eogwpabqeU0b7cp83Frqy6kisrths="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix index 4af139b084..f21f658ace 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { name = "ImageJ"; desktopName = "ImageJ"; icon = "imagej"; - categories = "Science;Utility;Graphics;"; + categories = [ "Science" "Utility" "Graphics" ]; exec = "imagej"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix index c454ed0422..d4d00ad9c6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -60,12 +60,10 @@ mkDerivation rec { comment = "A drawing editor for creating figures in PDF format"; exec = "ipe"; icon = "ipe"; - mimeType = "text/xml;application/pdf"; - categories = "Graphics;Qt;"; - extraDesktopEntries = { - StartupWMClass = "ipe"; - StartupNotify = "true"; - }; + mimeTypes = [ "text/xml" "application/pdf" ]; + categories = [ "Graphics" "Qt" ]; + startupNotify = true; + startupWMClass = "ipe"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index a113136c24..8dc057a17c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.26"; + version = "2.27"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q="; + sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ mkDerivation rec { description = "A 3D fractal rendering engine"; longDescription = "Mandelbulber creatively generates three-dimensional fractals. Explore trigonometric, hyper-complex, Mandelbox, IFS, and many other 3D fractals."; homepage = "https://mandelbulber.com"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ kovirobi ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index dcdfd364b5..dccfad9496 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "meshlab"; - version = "2021.10"; + version = "2022.02"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "Meshlab-${version}"; - sha256 = "14rrd8qrf91k89y6w2mn1r9zcfnwd0mir6g4dlgvr04i77hj4lk4"; + sha256 = "sha256-MP+jkiV6yS1T1eWClxM56kZWLXwu0g4w/zBHy6CSL6Y="; fetchSubmodules = true; # for vcglib }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix new file mode 100644 index 0000000000..8c414c3724 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, giflib +, imlib2 +, libXft +, libexif +, libwebp +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "nsxiv"; + version = "28"; + + src = fetchFromGitHub { + owner = "nsxiv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-12RmEAzZdeanrRtnan96loXT7qSjIMjcWf296XmNE+A="; + }; + + buildInputs = [ + giflib + imlib2 + libXft + libexif + libwebp + ]; + + preBuild = lib.optionalString (conf!=null) '' + cp ${(builtins.toFile "config.def.h" conf)} config.def.h + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://nsxiv.github.io/nsxiv/"; + description = "New Suckless X Image Viewer"; + longDescription = '' + nsxiv is a fork of now unmaintained sxiv with the purpose of being a + drop-in replacement of sxiv, maintaining it and adding simple, sensible + features, like: + + - Basic image operations, e.g. zooming, panning, rotating + - Customizable key and mouse button mappings (in config.h) + - Script-ability via key-handler + - Thumbnail mode: grid of selectable previews of all images + - Ability to cache thumbnails for fast re-loading + - Basic support for animated/multi-frame images (GIF/WebP) + - Display image information in status bar + - Display image name/path in X title + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix index b30dbab157..cf16ecc03c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix @@ -79,8 +79,8 @@ in mkDerivation rec { icon = "OpenBoard"; comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; - mimeType = "application/ubz"; - categories = "Education;"; + mimeTypes = [ "application/ubz" ]; + categories = [ "Education" ]; startupNotify = true; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix index ed2aae72d4..b598c53b89 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -63,6 +63,10 @@ buildDotnetModule rec { # Rename the binary mv "$out/bin/Pinta" "$out/bin/pinta" + # Copy runtime icons + mkdir -p $out/share/icons/hicolor/16x16/ + cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ + # Install dotnet build installer/linux/install.proj \ -target:Install \ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/skanpage/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/skanpage/default.nix new file mode 100644 index 0000000000..17a2288089 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/skanpage/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, kirigami2 +, ktextwidgets +, libksane +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "skanpage"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + kirigami2 + ktextwidgets + libksane + qtquickcontrols2 + ]; + + meta = with lib; { + description = "KDE utility to scan images and multi-page documents"; + homepage = "https://apps.kde.org/skanpage"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix index c9d119a7d6..93a600fff8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { desktopName = "SwingSane"; genericName = "Scan from local or remote SANE servers"; comment = meta.description; - categories = "Office;"; + categories = [ "Office" ]; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix index 65f6c46f7d..ca8cebb2ec 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/write_stylus/default.nix @@ -7,7 +7,7 @@ let icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; - categories = "Office;Graphics"; + categories = [ "Office" "Graphics" ]; }; in mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix index 7d9ab53bef..f831272387 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { icon = "xournal"; desktopName = "Xournal"; comment = meta.description; - categories = "Office;Graphics;"; - mimeType = "application/pdf;application/x-xoj"; + categories = [ "Office" "Graphics" ]; + mimeTypes = [ "application/pdf" "application/x-xoj" ]; genericName = "PDF Editor"; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index 9bfe71e196..d8838587d7 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -186,6 +186,7 @@ let kteatime = callPackage ./kteatime.nix {}; ktimer = callPackage ./ktimer.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktorrent = callPackage ./ktorrent.nix {}; ktouch = callPackage ./ktouch.nix {}; kturtle = callPackage ./kturtle.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; @@ -203,6 +204,7 @@ let libkomparediff2 = callPackage ./libkomparediff2.nix {}; libksane = callPackage ./libksane.nix {}; libksieve = callPackage ./libksieve.nix {}; + libktorrent = callPackage ./libktorrent.nix {}; mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; @@ -216,8 +218,10 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; + skanlite = callPackage ./skanlite.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; + zanshin = callPackage ./zanshin.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/applications/kde/ktorrent.nix b/third_party/nixpkgs/pkgs/applications/kde/ktorrent.nix new file mode 100644 index 0000000000..f63865d303 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/ktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + karchive, kcmutils, kcrash, kdnssd, ki18n, knotifications, knotifyconfig, + kplotting, kross, libgcrypt, libktorrent, taglib +}: + +mkDerivation { + pname = "ktorrent"; + meta = with lib; { + description = "KDE integrated BtTorrent client"; + homepage = "https://apps.kde.org/ktorrent/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kcmutils kcrash kdnssd ki18n knotifications knotifyconfig kplotting + kross libgcrypt libktorrent taglib + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/libktorrent.nix b/third_party/nixpkgs/pkgs/applications/kde/libktorrent.nix new file mode 100644 index 0000000000..3b4ae5f72f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/libktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, + boost, gmp +}: + +mkDerivation { + pname = "libktorrent"; + meta = with lib; { + description = "A BitTorrent library used by KTorrent"; + homepage = "https://apps.kde.org/ktorrent/"; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kcrash ki18n kio libgcrypt qca-qt5 solid ]; + propagatedBuildInputs = [ boost gmp ]; + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix new file mode 100644 index 0000000000..30ceba645b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, libksane +}: + +mkDerivation { + pname = "skanlite"; + meta = with lib; { + description = "KDE simple image scanning application"; + homepage = "https://apps.kde.org/skanlite"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ polendri ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kio libksane ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/zanshin.nix b/third_party/nixpkgs/pkgs/applications/kde/zanshin.nix new file mode 100644 index 0000000000..a43632ce36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/zanshin.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + akonadi-calendar, boost, kontactinterface, krunner +}: + +mkDerivation { + pname = "zanshin"; + meta = with lib; { + description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; + homepage = "https://zanshin.kde.org/"; + maintainers = with maintainers; [ zraexy ]; + license = licenses.gpl2Plus; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ akonadi-calendar boost kontactinterface krunner ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix b/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix index 92eeeb142c..9b5d2e68ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg="; + sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; @@ -19,6 +19,7 @@ mkDerivation rec { qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' + runHook preInstall install -d $out/bin install -d $out/share/OSCAR/Help install -d $out/share/OSCAR/Html @@ -32,15 +33,16 @@ mkDerivation rec { install oscar/Translations/* $out/share/OSCAR/Translations install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + runHook postInstall ''; meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.roconnor ]; # Someone needs to create a suitable installPhase for Darwin and Windows. # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. - broken = !stdenv.hostPlatform.isLinux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix index 6da5d46f88..2f07b6dbf9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -3,31 +3,15 @@ let defaultOverrides = [ (self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.1.2"; - pname = "Flask"; + wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + pname = "WTForms"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-Tvoa4tfJhlr0iYbeiuuFBL8yx/PW/ck1PTSyH0sScGA="; + sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI="; }; - checkInputs = [ self.pytest ]; - propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; - - doCheck = false; - }); - }) - - (self: super: { - flask_login = super.flask_login.overridePythonAttrs (oldAttrs: rec { - pname = "Flask"; - version = "0.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; - }; doCheck = false; }); }) @@ -45,7 +29,7 @@ let py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (defaultOverrides); + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; }; in @@ -53,11 +37,11 @@ with py.pkgs; buildPythonApplication rec { pname = "archivy"; - version = "1.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nwpH3V6hkPC8G3df+0hTZqvIbvT1Z796uOI/iKnXS1w="; + sha256 = "sha256-UNGl5Dl/E3+uQ4HIxzHYliHF4lqD3GYdeoL+DtqUwCo="; }; # Relax some dependencies @@ -72,7 +56,7 @@ buildPythonApplication rec { --replace 'validators ==' 'validators >=' \ --replace 'tinydb ==' 'tinydb >=' \ --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ - --replace 'Werkzeug ==' 'Werkzeug >=' + --replace 'Flask ==' 'Flask >=' ''; propagatedBuildInputs = [ @@ -87,11 +71,11 @@ buildPythonApplication rec { html2text python-dotenv python-frontmatter + readability-lxml requests setuptools tinydb validators - werkzeug wtforms ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix index 7325e29f68..d480882958 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix @@ -7,26 +7,19 @@ stdenv.mkDerivation rec { pname = "avizo"; - # Note: remove the 'use-sysconfig' patch on the next update - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8="; + sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; - patches = [ - # Remove on next update - # See https://github.com/misterdanb/avizo/pull/30 - ./use-sysconfdir-instead-of-etc.patch - ]; - postInstall = '' substituteInPlace "$out"/bin/volumectl \ --replace 'avizo-client' "$out/bin/avizo-client" diff --git a/third_party/nixpkgs/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch b/third_party/nixpkgs/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch deleted file mode 100644 index 947559760c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c789be..cd4b07a 100644 ---- a/meson.build -+++ b/meson.build -@@ -12,7 +12,9 @@ app_resources_service = gnome.compile_resources( - source_dir : '.', - c_name : 'avizo_resources') - --install_data('config.ini', install_dir: '/etc/xdg/avizo') -+sysconfdir = get_option('sysconfdir') -+ -+install_data('config.ini', install_dir: join_paths(sysconfdir, 'xdg/avizo')) - install_data('volumectl', install_dir: 'bin') - install_data('lightctl', install_dir: 'bin') - diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix index 378a04bada..458b0484af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -32,19 +32,16 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --unity-launch %F"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; - extraEntries = '' - StartupWMClass=azuredatastudio - Actions=new-empty-window; - Keywords=azuredatastudio; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=azuredatastudio --no-sandbox --new-window %F - Icon=azuredatastudio - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ]; + keywords = [ "azuredatastudio" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -54,13 +51,12 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --open-url %U"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/azuredatastudio;"; - extraEntries = '' - NoDisplay=true - Keywords=azuredatastudio; - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/azuredatastudio" ]; + keywords = [ "azuredatastudio" ]; + noDisplay = true; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix index 0464ec5828..e92bd4b82a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-687/v3YvRXbop5EouXS5/aI5P+o0QgpWlUCVzDG8jzM="; + sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index 22d7560c68..865e3a849a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -20,8 +20,8 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.2.14-trento"; - sha256 = "GtVC3JfVoooJ+MuF9r1W3J8RfXNKalaIgecv1ner7GA="; + version = "2022.2.28-trento-1"; + sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds="; src = fetchFromGitHub { owner = "bottlesdevs"; @@ -99,6 +99,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; + downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; maintainers = with maintainers; [ bloomvdomino psydvl shamilton ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 1d6af843e2..b3754fed17 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -23,15 +23,16 @@ , xdg-utils , removeReferencesTo , libstemmer +, wrapGAppsHook }: mkDerivation rec { pname = "calibre"; - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-1NQB7vrcU0hR308/8keUn/rHhdvJk5Ab0pOMPyiU1+M="; + hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -62,7 +63,7 @@ mkDerivation rec { dontUseQmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ chmlib @@ -95,7 +96,6 @@ mkDerivation rec { feedparser html2text html5-parser - jeepney lxml markdown mechanize @@ -154,7 +154,6 @@ mkDerivation rec { # Wrap manually dontWrapQtApps = true; - dontWrapGApps = true; # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: @@ -166,7 +165,6 @@ mkDerivation rec { for program in $out/bin/*; do wrapProgram $program \ ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index 5f0c09303f..2379b702ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.9.2"; + version = "0.10.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; + sha256 = "sha256-kyfyRq/5QWMoiMooEpLv7UkehGxFlrfGEq9jA3OHiIs="; }; - vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk="; + vendorSha256 = "sha256-LB5fwySDOH+kOYYdGdtLAvETmI6fFP2QT6l2eAS3Ijg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 237c912678..067ad872f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.45"; + version = "0.99.46"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-DGhzqv7huFVgCdXy3DuIBT+7s2q6FB7+gFPd4zEXi2M="; + sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix index 8ec80e9952..b976ea8907 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; + sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix index f8f7fb8491..777c4b97d2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktopName = "Cubiomes Viewer"; exec = pname; icon = pname; - categories = "Game"; + categories = [ "Game" ]; comment = meta.description; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cura/stable.nix b/third_party/nixpkgs/pkgs/applications/misc/cura/stable.nix index a2ec91193e..d330a8a5ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cura/stable.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cura/stable.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { comment = "Cura"; desktopName = "Cura"; genericName = "3D printing host software"; - categories = "GNOME;GTK;Utility;"; + categories = [ "GNOME" "GTK" "Utility" ]; }; python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix index c6af30b785..085fcab147 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.12.1"; + version = "4.13.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE="; + sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 43bcef4c8d..ba1682f02d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-n8QaOYFLQYxJcq/+7bBIKuYtqeIJIwa8b1pniH+FMXk="; + sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-fJs/XM8PZqm/CrhShtcy4R/4s8dCc1WdXIvYSCYZ4dw="; + outputHash = "sha256-WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI="; }; nativeBuildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { desktopName = "dbeaver"; comment = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix index 4f1d68774d..17ce1d562b 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.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-8s8g1J8vEogCp29tSwX5eqYTDf1dLoyBznnwAlCMQOU="; + sha256 = "sha256-bSlSOAxIcFS5B5o3pWmXFsKthAXzbCltnbLAV/bIHLw="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix index 412aec97ae..c8fb9f84ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum-grs/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Groestlcoin"; repo = "electrum-grs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix b/third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix new file mode 100644 index 0000000000..9c28c98bf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/emojipick/default.nix @@ -0,0 +1,71 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +, python3 +, xclip +, libnotify +, dmenu +, rofi +, emojipick-use-rofi ? false +, emojipick-copy-to-clipboard ? true +, emojipick-show-notifications ? true +, emojipick-print-emoji ? true +, emojipick-font-family ? "Noto Color Emoji" +, emojipick-font-size ? "18" +}: + +let + boolToInt = b: if b then "1" else "0"; # Convert boolean to integer string +in +stdenvNoCC.mkDerivation { + pname = "emojipick"; + version = "2021-01-27"; + + src = fetchFromGitHub { + owner = "thingsiplay"; + repo = "emojipick"; + rev = "20210127"; + sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp"; + }; + + dontConfigure = true; + dontBuild = true; + + # Patch configuration + # notify-send has to be patched in a bash file + postPatch = '' + substituteInPlace emojipick \ + --replace "use_rofi=0" "use_rofi=${boolToInt emojipick-use-rofi}" \ + --replace "copy_to_clipboard=1" "copy_to_clipboard=${boolToInt emojipick-copy-to-clipboard}" \ + --replace "show_notification=1" "show_notification=${boolToInt emojipick-show-notifications}" \ + --replace "print_emoji=1" "print_emoji=${boolToInt emojipick-print-emoji}" \ + --replace "font_family='\"Noto Color Emoji\"'" "font_family='\"${emojipick-font-family}\"'" \ + --replace 'font_size="18"' 'font_size="${emojipick-font-size}"' \ + ${lib.optionalString emojipick-use-rofi "--replace 'rofi ' '${rofi}/bin/rofi '"} \ + --replace notify-send ${libnotify}/bin/notify-send + ''; + + buildInputs = [ + python3 + xclip + libnotify + ] ++ (if emojipick-use-rofi then [rofi] else [dmenu]); + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./emojipick $out/bin + cp ./emojiget.py $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Get a selection of emojis with dmenu or rofi"; + homepage = "https://github.com/thingsiplay/emojipick"; + license = licenses.mit; + maintainers = with maintainers; [ alexnortung ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix index 2ae01332b9..34c0e857a4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "1.2.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "f3162efcf0407614fd1351af50e95ef180400b747a5cc6b82bc840828a15548d"; + sha256 = "a052efa29aa692eeafc921a2be4a5cbf71ae0b4216bd4759ea179086fb44c6d6"; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix index 9c6d95b319..14de4af2c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "1qmxzpv2xy79aznzzr9fay61mzf1pdzv85ah3w3q2kl2i7pskfxb"; + sha256 = "sha256-Ni1LwsBkh+XekHEAPxoAkE3tjgUByvpLUGpx7WC54Jw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix index 14351990e7..e793618f9d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -74,8 +74,7 @@ stdenv.mkDerivation rec { exec = "free42bin"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) (makeDesktopItem { name = "com.thomasokken.free42dec"; @@ -84,8 +83,7 @@ stdenv.mkDerivation rec { exec = "free42dec"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index 76a19f5188..6946657274 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { desktopName = "GanttProject"; genericName = "Shedule and manage projects"; comment = meta.description; - categories = "Office;"; + categories = [ "Office" ]; }; javaOptions = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix b/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix index 44e4bd2a0b..ebed42852b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; + sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI="; }; - cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; + cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ="; meta = with lib; { description = "A nonsense activity generator"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix index d92c4d0491..26d729fe8a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk="; + sha256 = "sha256-AqA0hzZGn5XU2Pyoj1vaP+ht7r3dpDhuang4KCXaSgs="; }; - vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY="; + vendorSha256 = "sha256-S+CnIPoyGM7dEQICOIlAWBIC24Fyt7q+OY382evDgQc="; + + ldflags = [ "-X main.version=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix index 0a62ce4ea5..523ba837f3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gkrellm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desktopName = "GKrellM"; genericName = "System monitor"; comment = "The GNU Krell Monitors"; - categories = "System;Monitor;"; + categories = [ "System" "Monitor" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix new file mode 100644 index 0000000000..e7ec63f978 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/globe-cli/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "globe-cli"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; + }; + + cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; + + meta = with lib; { + description = "Display an interactive ASCII globe in your terminal"; + homepage = "https://github.com/adamsky/globe"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index b2a858d8d3..7f796a2bb0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -12,7 +12,7 @@ let desktopName = "GoldenCheetah"; genericName = "GoldenCheetah"; comment = "Performance software for cyclists, runners and triathletes"; - categories = "Utility;"; + categories = [ "Utility" ]; }; in mkDerivation rec { pname = "golden-cheetah"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix new file mode 100644 index 0000000000..9b335b1aed --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/gometer/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: + +stdenv.mkDerivation rec { + pname = "gometer"; + version = "5.2.0"; + + src = fetchurl { + url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; + sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; + }; + + nativeBuildInputs = [ + rpmextract + wrapGAppsHook + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + rpmextract ${src} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + mkdir $out/share/applications + mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop + substituteInPlace $out/share/applications/gometer.desktop \ + --replace '/opt/goMeter/' "" + + makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ + --add-flags $out/opt/goMeter/package.nw + + runHook postInstall + ''; + + meta = with lib; { + description = "Analytic-Tracking tool for GoLance"; + homepage = "https://golance.com/download-gometer"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 62dccc91e6..1c898fa343 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; - categories = "Education;Geoscience;"; + categories = [ "Education" "Geoscience" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix index 15d8b96639..95a909c29a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -1,18 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gsctl"; - version = "0.15.4"; - - goPackagePath = "github.com/giantswarm/gsctl"; + version = "1.1.4"; src = fetchFromGitHub { owner = "giantswarm"; repo = pname; - rev = version; - sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; + rev = version; + sha256 = "sha256-uCNWgaLZMm1vPxFduj8mpjKYuYlp1ChF6bK+bmAWy50="; }; + vendorSha256 = "sha256-lZgHrQYqoyoM1Iv6vCqTMcv62zSKyxaAsq56kUXHrIA="; + + ldflags = + [ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; + + doCheck = false; + meta = with lib; { description = "The Giant Swarm command line interface"; homepage = "https://github.com/giantswarm/gsctl"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix new file mode 100644 index 0000000000..236af7c446 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hcl2json"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs="; + }; + + vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert hcl2 to json"; + homepage = "https://github.com/tmccombs/hcl2json"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/ideamaker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ideamaker/default.nix index 1996ba5c1e..1e20a0d6fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ideamaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ideamaker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Viewer;Engineering;"; - mimeType = "application/sla"; + categories = [ "Utility" "Viewer" "Engineering" ]; + mimeTypes = [ "application/sla" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix index 92491f4508..4c01e52aa5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ipmiview/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { exec = "IPMIView"; desktopName = name; genericName = "Supermicro BMC manager"; - categories = "Network"; + categories = [ "Network" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 2003e0d7e7..42d87b41fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.6.10"; + version = "2.7.13"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4="; - x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4="; + x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs="; + x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k="; }.${system} or throwSystem; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index b2907ffedc..e6cadec469 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.13.53591"; + version = "0.13.55213"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-sffJks3/QfAJJumaE61q4fiiXa/BNFF2TKjZmDOuMkc="; + sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix new file mode 100644 index 0000000000..b50a175151 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, makeWrapper +, writeText +, python3 +, fetchzip +, inkscape +, lib +, udevGroup ? "k40" +}: + +let + pythonEnv = python3.withPackages (ps: with ps; [ + lxml + pyusb + pillow + pyclipper + tkinter + ]); + + udevRule = writeText "k40-whisperer.rules" '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", ENV{DEVTYPE}=="usb_device", MODE="0664", GROUP="${udevGroup}" + ''; + +in stdenv.mkDerivation rec { + pname = "k40-whisperer"; + version = "0.59"; + + src = fetchzip { + url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; + stripRoot = true; + sha256 = "0r8rhaksk87l44pwwpvrfnck2lyic3lgcbh3pi7ib6mrwbsyhlni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace svg_reader.py \ + --replace '"/usr/bin/inkscape"' '"${inkscape}/bin/inkscape"' + ''; + + buildPhase = ""; + + installPhase = '' + mkdir -p $out + cp -p * $out + + mkdir -p $out/bin + mkdir -p $out/lib/udev/rules.d + + ln -s ${udevRule} $out/lib/udev/rules.d/97-k40-whisperer.rules + + makeWrapper '${pythonEnv.interpreter}' $out/bin/k40-whisperer \ + --add-flags $out/k40_whisperer.py \ + --prefix PYTHONPATH : $out + ''; + + meta = with lib; { + description = '' + Control software for the stock K40 Laser controller + ''; + mainProgram = "k40-whisperer"; + longDescription = '' + K40 Whisperer is an alternative to the the Laser Draw (LaserDRW) program that comes with the cheap Chinese laser cutters available on E-Bay and Amazon. + K40 Whisperer reads SVG and DXF files, interprets the data and sends commands to the K40 controller to move the laser head and control the laser accordingly. + K40 Whisperer does not require a USB key (dongle) to function. + ''; + homepage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html"; + downloadPage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html#download"; + license = licenses.gpl3; + maintainers = with maintainers; [ fooker ]; + platforms = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index 4276ce8a84..bc281bea16 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -69,11 +69,8 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Utility;"; - mimeType = lib.concatStringsSep ";" [ - "application/x-keepass2" - "" - ]; + categories = [ "Utility" ]; + mimeTypes = [ "application/x-keepass2" ]; }; outputFiles = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 2d75a9da81..9ed6781734 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch +{ lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper +, which, perl }: mkDerivation rec { pname = "klayout"; - version = "0.27.3"; + version = "0.27.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0="; + hash = "sha256-t/nd7m8XpB026q/kyH16rKkw3qza19ISalB0Juzx4NU="; }; postPatch = '' @@ -21,6 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ which + perl python3 ruby ]; @@ -35,7 +36,7 @@ mkDerivation rec { buildPhase = '' runHook preBuild mkdir -p $out/lib - ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES + ./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES runHook postBuild ''; @@ -54,8 +55,9 @@ mkDerivation rec { meta = with lib; { description = "High performance layout viewer and editor with support for GDS and OASIS"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; + changelog = "https://www.klayout.de/development.html#${version}"; platforms = platforms.linux; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index 38ad131bc1..2e6318f988 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.01"; + version = "2022.02"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-XuIYNvGhzJ649LxVPit2AOmb+YOHtZA4AhDyxjaB5OE="; + sha256 = "sha256-gR81ZN0N3bmvLVqwUanXTrpBnzhPZT0bo4J8VOfaJh8="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix index eadd6c8db5..73c8abaa13 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; + sha256 = "sha256-52Tq6gKozM/IFUyAy8N+YDqlbcFNQw6b2tc268Zco6g="; }; - vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; + vendorSha256 = "sha256-7QEb5J5IaxisKjbulyHq5PGVeKAX022Pz+5OV5qD7Uo="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index 0ce868ada6..f4e43a79a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.9"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "e47aaabcd940b54962625e224961e9b95b7f18b99724adbb6334cdc549617389"; + sha256 = "ccLqOKH10hmROnxlnNxuD5/AqAcFIILIoW/9yZLEep0="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix index 2dfbaeb994..eceb9308fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { desktopName = "lsd2dsl"; genericName = "lsd2dsl"; comment = meta.description; - categories = "Dictionary;FileTools;Qt;"; + categories = [ "Dictionary" "FileTools" "Qt" ]; }); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix index b5ec8424e2..08c2c7afc4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "1c2ba9424f600f35b7b883366296089cf61ac7c803da5d411a334c7a39ccf84b"; + sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix index d1d16a7c8c..ccf56da05a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "markets"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "bitstower"; repo = "markets"; rev = version; - sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv"; + sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix index f4d242346e..3144f59476 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y="; + sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s="; + cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/michabo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/michabo/default.nix index 015a326fdc..c356dc1978 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/michabo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/michabo/default.nix @@ -10,7 +10,6 @@ let desktopItem = makeDesktopItem { - type = "Application"; name = "Michabo"; desktopName = "Michabo"; exec = "Michabo"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index 6a1f14cbd4..2786492d47 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , python3Packages -, steam-run-native +, steam-run , unzip , webkitgtk , wrapGAppsHook @@ -54,14 +54,14 @@ python3Packages.buildPythonApplication rec { python3.pkgs.requests python3.pkgs.setuptools python3.pkgs.simplejson - steam-run-native + steam-run unzip webkitgtk ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy + sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 144e629820..39348b9ede 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4895"; + version = "4896"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "jGSDH90ze0hHa9nAaeEkj1sfADEk7EatGrePM3+/SDk="; + sha256 = "1tPKZASmU0xfQgNZJYzhtvm0f7ynrWk/RWCFZ1kseKs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 15a7275bd8..4cd7692f67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "mob"; - version = "2.2.1"; + version = "2.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-1yE3KFGY51m6OL4LYrz+BSCHQSnbQRSpB3EUqAzSr+M="; + sha256 = "sha256-NXctu5gg0QfiTZ7osQ0yzETabGDuEeTVZBPFyLeNq8k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix index 0ef26eea45..3d0cbdcefa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,11 +2,11 @@ let pname = "mobilecoin-wallet"; - version = "1.4.1"; + version = "1.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin-Wallet-${version}.AppImage"; - sha256 = "sha256-x5frHgkEz77pqSB6YANRtZmCzaK/RxRzMElLu49lxPk="; + sha256 = "sha256-zSTtnKvgcDSiicEDuVK2LN2d8WHiGReYI3XLBmm3Fbo="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix index 15816b6692..be4bd5f430 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/natural-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "natural-docs"; - version = "2.1.1"; + version = "2.2"; src = fetchzip { url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip"; - sha256 = "03fizjgvhiw3lqyykqw1whdh97xyiy3f226c1348ll61ryjxamqw"; + sha256 = "sha256-W0E9wamzABnPleVhHHXTIdWJk8kWnrUHojM+pcsowy8="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/neo/default.nix index fda086c49d..e091a572c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/neo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/neo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo"; - version = "0.6"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz"; - sha256 = "sha256-skXLT1td4dGdsu+wbX44Z2u5sDEOKXYVVys4Q6RayIk="; + sha256 = "sha256-pV5O1e/QpK8kjRYBinqq07YX7x06wF0pKiWKOKr0ank="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix index 6807cd9024..ac3fa9200a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -4,15 +4,16 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; version = "2.1.0"; - # The size of the nerd fonts repository is bigger than 2GB, because it - # contains a lot of fonts and the patcher. - # until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed, - # we download the patcher from an alternative repository + # This uses a sparse checkout because the repo is >2GB without it src = fetchFromGitHub { - owner = "betaboon"; - repo = "nerd-fonts-patcher"; - rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0"; - sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI="; + owner = "ryanoasis"; + repo = "nerd-fonts"; + rev = "v${version}"; + sparseCheckout = '' + font-patcher + /src/glyphs + ''; + sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix index 664b2bf03a..973a05ad1d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix @@ -15,7 +15,7 @@ let icon = "obinskit"; desktopName = "Obinskit"; genericName = "Obinskit keyboard configurator"; - categories = "Utility"; + categories = [ "Utility" ]; }; electron = electron_13; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 6626c33215..5e71f7d0d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -15,7 +15,7 @@ let comment = "Knowledge base"; icon = "obsidian"; exec = "obsidian"; - categories = "Office"; + categories = [ "Office" ]; }; updateScript = writeScript "obsidian-updater" '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/oil/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oil/default.nix new file mode 100644 index 0000000000..173cea2ee1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/oil/default.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC, lib, fetchFromGitHub, jq, gawk, peco, makeWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "oil-buku"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "AndreiUlmeyda"; + repo = "oil"; + rev = version; + sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr"; + }; + + postPatch = '' + substituteInPlace src/oil --replace \ + "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib" + + substituteInPlace Makefile --replace \ + "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \ + + substituteInPlace Makefile --replace \ + "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin" + + substituteInPlace src/json-to-line.jq --replace \ + "/usr/bin/env -S jq" "${jq}/bin/jq" + + substituteInPlace src/format-columns.awk --replace \ + "/usr/bin/env -S awk" "${gawk}/bin/awk" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/oil \ + --prefix PATH : ${lib.makeBinPath [ peco ]} + ''; + + meta = with lib; { + description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; + homepage = "https://github.com/AndreiUlmeyda/oil"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix index 1ee4825647..a075a9bec6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix @@ -37,7 +37,8 @@ let # base pkg/lib baseLib = python3Packages.callPackage ./lib.nix { }; in mkDerivation { - inherit (baseLib) pname version src; + pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; + inherit (baseLib) version src; nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix index 9bef85c2b2..009633f327 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix @@ -45,7 +45,7 @@ in mkDerivation { }; desktopName = name; genericName = "Head tracking software"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix index 364bb6c80d..afc0ac71d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UR7h+btmOSnpjkrQMiABcM1tOFjOhNVWuKYDF9qXfFo="; + sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 298b4bf2c0..745796098e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "PDFsam Basic"; genericName = "PDF Split and Merge"; - mimeType = "application/pdf;"; - categories = "Office;"; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix index 7240e8a026..8c034d6636 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix @@ -40,10 +40,8 @@ let exec = "${pname} %f"; icon = "${pname}${year}"; comment = "Views and edits PDF files"; - mimeType = "application/pdf"; - categories = "Office"; - type = "Application"; - terminal = false; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix index 9b034f9f90..e2e1906926 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plater/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Engineering;"; + categories = ["Utility" "Engineering"]; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index 320d771bc6..58d45d19be 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -22,9 +22,12 @@ , jq , xorg , libGL -, steam-run-native +, steam-run # needed for avoiding crash on file selector , gsettings-desktop-schemas +, glib +, wrapGAppsHook +, hicolor-icon-theme }: let @@ -76,16 +79,19 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") ''; buildInputs = [ + glib xorg.libX11 libGL python + gsettings-desktop-schemas + hicolor-icon-theme ]; postPatch = '' @@ -107,7 +113,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/playonlinux < doc/Makefile.am - # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged. - for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do - substituteInPlace src/Makefile.am \ - --replace "$perltool" "${perlenv}/bin/perl $perltool" - done - substituteInPlace lib/Makefile.am \ - --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font' - substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex ''; + enableParallelBuilding = true; + doCheck = (!stdenv.isDarwin); # times out + enableParallelChecking = false; + meta = with lib; { description = "Free Software/Open Source software package for mapping caves"; longDescription = '' @@ -71,7 +64,7 @@ stdenv.mkDerivation rec { variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. ''; homepage = "https://survex.com/"; - changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; + changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS"; license = licenses.gpl2Plus; maintainers = [ maintainers.matthewcroughan ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index bfe9af7684..f2c8e6075d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -37,7 +37,7 @@ let icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index d6ea3fccfa..9ef9fd0f7f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -40,7 +40,7 @@ let name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix index 96265356ea..7e4ac3a570 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "teleprompter"; exec = "teleprompter"; - type = "Application"; desktopName = "Teleprompter"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index e345c344f9..ebc9b49966 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; + sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es="; }; - vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; + vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix index 6623a8775a..910f92a849 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix @@ -133,7 +133,7 @@ let ''; desktopItem = makeDesktopItem rec { - categories = "Utility;"; + categories = [ "Utility" ]; desktopName = "Toggl"; genericName = desktopName; name = "toggldesktop"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix index b6ff021169..8a70250606 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { desktopName = "TrenchBroom level editor"; icon = "trenchbroom"; comment = meta.description; - categories = "Development"; + categories = [ "Development" ]; exec = "trenchbroom"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix index 7e76d4a4e0..a1adc15234 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix @@ -1,7 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -# Upstream has a `./vendor` directory with all deps which we rely upon. -buildGoPackage rec { +buildGoModule rec { pname = "tty-share"; version = "2.2.1"; @@ -12,7 +11,10 @@ buildGoPackage rec { sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; }; - goPackagePath = "github.com/elisescu/tty-share"; + # Upstream has a `./vendor` directory with all deps which we rely upon. + vendorSha256 = null; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://tty-share.com"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix index fa08b5f555..bd8fdf5e48 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/bin.nix @@ -8,11 +8,9 @@ let comment = "Themeable and easy to use TV Guide"; desktopName = "TV-Browser"; genericName = "Electronic TV Program Guide"; - categories = "AudioVideo;TV;Java;"; - startupNotify = "true"; - extraEntries = '' - StartupWMClass=tvbrowser-TVBrowser - ''; + categories = [ "AudioVideo" "TV" "Java" ]; + startupNotify = true; + startupWMClass = "tvbrowser-TVBrowser"; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix index 5543b3442b..dc50a3b956 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.0"; + version = "5.6.10.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_0_b124e6f3a4944b32/${pname}_${version}_amd64.deb"; - sha256 = "fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_1_de501d28cc034306/${pname}_${version}_amd64.deb"; + sha256 = "8faf896d2570d1d210793f46a3860e934d03498c1f11640d43721b6eb2b56860"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wego/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wego/default.nix index 4bbd0289a1..d446e05717 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wego/default.nix @@ -1,23 +1,21 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "wego"; - version = "unstable-2019-02-11"; - rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + version = "2.1"; - goPackagePath = "github.com/schachmat/wego"; - - src = fetchgit { - inherit rev; - url = "https://github.com/schachmat/wego"; - sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; + src = fetchFromGitHub { + owner = "schachmat"; + repo = pname; + rev = version; + sha256 = "sha256-lMcrFwYtlnivNjSbzyiAEAVX6ME87yB/Em8Cxb1LUS4="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-kv8c0TZdxCIfmkgCLDiNyoGqQZEKUlrNLEbjlG9rSPs="; - meta = { - license = lib.licenses.isc; + meta = with lib; { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; + license = licenses.isc; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/wego/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/wego/deps.nix deleted file mode 100644 index 133315cd02..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/wego/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/schachmat/ingo"; - fetch = { - type = "git"; - url = "https://github.com/schachmat/ingo"; - rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; - sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; - sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix index d478655eed..3920a3a865 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; + sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix index 5f71f90992..bcc4fca33b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmind/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { icon = "xmind"; desktopName = "XMind"; comment = meta.description; - categories = "Office;"; - mimeType = "application/xmind;x-scheme-handler/xmind"; + categories = [ "Office" ]; + mimeTypes = [ "application/xmind" "x-scheme-handler/xmind" ]; }; installPhase = let diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix index eb5ebf3a71..927b04d5e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { comment = "Views Adobe PDF files"; icon = "xpdf"; exec = "xpdf %f"; - categories = "Office;"; - terminal = "false"; + categories = [ "Office" ]; }; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix index 0a18975d7c..db28952c31 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk="; + sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM="; + cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 7949676091..0d4c21dbfe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.2"; + version = "2.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-gCnIEwnwlX7Wy9sjJVtKx8HhtPAoPMUOKvl71TQn6Ew="; + sha256 = "sha256-BXStGhCEXpQRyLjcS00CM/NI/NVRKpLTlW8Xh51fV8w="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix b/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix index 5682091237..5f78b244ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Aether"; genericName = meta.description; - categories = "Network;"; - mimeType = "x-scheme-handler/aether"; + categories = [ "Network" ]; + mimeTypes = [ "x-scheme-handler/aether" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix index d9fe26fdbd..8b20c1aac6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/apache-directory-studio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Eclipse-based LDAP browser and directory client"; desktopName = "Apache Directory Studio"; genericName = "Apache Directory Studio"; - categories = "Java;Network"; + categories = [ "Java" "Network" ]; }; buildInputs = [ glib libsecret ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix index 842cbe3030..2f2a708455 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E="; + sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk="; + vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; 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 6fb29619ab..cbf055c564 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.35.103"; + version = "1.36.109"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; + sha256 = "KKoMpMagq5lVoRFyWNs92LdPwNIlmAjfwqxfOArIFeo="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 0f021b2075..0eb1893e95 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,7 +96,7 @@ let "libpng" "libwebp" "libxslt" - "opus" + # "opus" ]; opusWithCustomModes = libopus.override { @@ -220,7 +220,7 @@ let # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node - ln -s "${pkgsBuildHost.jre8}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.jre8_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py 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 b3738ed8c1..084db58f38 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,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -54,6 +54,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { + llvmPackages = llvmPackages_14; + stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix { @@ -207,8 +210,8 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS - # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH" + # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): + export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" . w 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 d5af185348..f59cee7bab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,8 @@ { "stable": { - "version": "98.0.4758.102", - "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", - "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", - "deps": { - "gn": { - "version": "2021-12-07", - "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" - } - }, - "chromedriver": { - "version": "98.0.4758.102", - "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", - "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", - "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" - } - }, - "beta": { - "version": "99.0.4844.35", - "sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj", - "sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4", + "version": "99.0.4844.51", + "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", + "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", "deps": { "gn": { "version": "2022-01-10", @@ -29,12 +10,18 @@ "rev": "80a40b07305373617eba2d5878d353532af77da3", "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } + }, + "chromedriver": { + "version": "99.0.4844.35", + "sha256_linux": "1q10mn34s03zy0nqcgrjd7ry53g4paxpwcki1bgicpcrwnjlzc3y", + "sha256_darwin": "0mcfry8vqqc8n1sgyn2azr8pc4lgjnkpnhz0ggjqm12njq0lfjfx", + "sha256_darwin_aarch64": "19wpqd5mq2vrgma899vbbdqhg660x47v4ppbz1r8dcg5r5y93x3s" } }, - "dev": { - "version": "100.0.4892.0", - "sha256": "03f003prk0vqxac7l0sp3nfhh3adlrdx60dklm74v504ykdw84yn", - "sha256bin64": "00033b2iq3aw5pvgm5nbh99sz8mj98rj32h1m6iw2xxwqaij06qw", + "beta": { + "version": "100.0.4896.20", + "sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr", + "sha256bin64": "1qkz32xvgbnd7xck0hm2mcrgdawn6xilldjgfckaaavvj4zinnk9", "deps": { "gn": { "version": "2022-01-21", @@ -44,6 +31,19 @@ } } }, + "dev": { + "version": "101.0.4919.0", + "sha256": "01dp3pkpf2m6r6vfyqgcg99xcii0qi3qm0g69r3nnj2hrs7ziqv2", + "sha256bin64": "1x7bfcnhrbakcbdyp1sc79jx6qysnnyj1by6qnl7gyffh8xyb95g", + "deps": { + "gn": { + "version": "2022-03-01", + "url": "https://gn.googlesource.com/gn", + "rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb", + "sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w" + } + } + }, "ungoogled-chromium": { "version": "98.0.4758.102", "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", 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 25ae29459f..c04b7f6588 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "97.0.1"; + version = "97.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ach/firefox-97.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a10737964c66f46a15ca60c29575a837340e9b967c849809717c7009c3a01c20"; + sha256 = "06103fa79feea876422843439c9d806634dcec91cc75288659df2597ce3a94ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/af/firefox-97.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a6ef82107f918234c84da51b49bc2018910e855ac4e7e5cc3a0e71f3583140b6"; + sha256 = "1c1694e6a7b9460c009395fe69a388e38180fad1e772a3b25167bf883aad4977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/an/firefox-97.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "34f5a0461707feffce732749958f508efd729ecedd8567dbe1387bde5e335a66"; + sha256 = "2209fc5aa9f128a04efc54c1f87ba7e29bb20410810d37cd7585896dad209400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ar/firefox-97.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5e126bcfa03c79e9ad777d76389a23e109dd852fc98698efc714d37125656f84"; + sha256 = "540b8871c713288704eb50c3e6ccad4aa4633a6733e3a9bd7e6392bc37325a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ast/firefox-97.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "931ae804e75fa4b039eb373a38b2f6fa8dffb852e418789d559d9a9c0612c54e"; + sha256 = "79791936785b296e9d6313616f0186ae4e1f79b0346cd2565315f55c6c43127e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/az/firefox-97.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "549dda8a1049d074887f187689e73c38b814c1f1896752320f2a03f566bad2c8"; + sha256 = "d853989cef9482473e20bfd45ca58028b1607cdb4892fc5d89c495d0f4aa3518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/be/firefox-97.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06b0f7aabf8ed42ee6f021bc37abb44029586f5ddd2673f885f73f94c64032c7"; + sha256 = "8d0916765b3daef73af89d594155ab99cbec6d2c555bf2b98d77906cb7fdf02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bg/firefox-97.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "72f5e07d24a2810659fc7d5c9a43214f427286f9a0096d602be0edbdb31d529c"; + sha256 = "3a11ce5379ee46890cd4dbd870d3076848ce5ad842303798b577bb2ad9d06dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bn/firefox-97.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9f3d0376edd2c74b527190a5d53f0d2a36c371484fe4fff1f91c1d03b0a2dabd"; + sha256 = "0092a295b61df555e4f217e13a8d2549c23931673cb811d0bf6dd970ee2dc5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/br/firefox-97.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "befbc0e991718afb4dc5362fa9aaae52a0e60fcac158a666a2b7a7b41eeaf834"; + sha256 = "77093f532db755d9b12c8b325fd152229223cbe552708749b5c67a74caa2f0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bs/firefox-97.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a4d41ac7495d4d5311d5e03224a1c75a03fa059b6638666fc0622674ebfc6248"; + sha256 = "07e863a6cb8776af8142c03cddd9d88e7b9cc9f58d196c47a45a6e4026489b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ca-valencia/firefox-97.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2ff1b0f0035374f323fe2bfbacd321394fb040599ed064627f60d24c78571394"; + sha256 = "a7c30b0f7c167a1b9ef11f1677355b98e88ec2ca5dbe029c1a61bdabf580aab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ca/firefox-97.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6f979602867721179454d2f6286cbecbf0a14aa0d42ba68ff7d7ca751f15a341"; + sha256 = "91435687d154908d07fac68a2a916cdd21a31a50aab4c6427e5d00458137d5c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cak/firefox-97.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "dd8bc5188874f0b5b300a03a7ded9fe059ddf9c9f69112429233f2905a5b329f"; + sha256 = "3a204dc9e8da4bfd7f9e5310c23cd0ae52ce4c4a7f3c1175ce6c76d0972ab0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cs/firefox-97.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8daef8ab21ad86b68999e052114b17b52d44e64e85b8879b690717c4017aa983"; + sha256 = "dba92bf8ba406c2626422481a2dddc220d74a239b57ee40372d09aa4e7f513fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cy/firefox-97.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "758d098d80d37b2bf15dcc3b16ad7289439166a3c7321bf815c555d96531589e"; + sha256 = "15f83a6eb972193a25f382d500ea2e01a88b11e43a981c7e0d49396750c19e6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/da/firefox-97.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6fab3975b94d94809c734ee95cb26d9bcf24af71234a1bc3b8c4db0b97355405"; + sha256 = "0db23e6b132998e974749fc195043a457ae860163707b1bf0517a00aa1e57237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/de/firefox-97.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1b776d58ce3b1d21580f725b065b164a6fc23e5b17d70025830286922f5c1455"; + sha256 = "6481bfe00c9ab3de1f6b374610ffe285bb58501ffa0b0779859759f76bb10bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/dsb/firefox-97.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9b9c082e7fe273635b1095e6caebf8645abf3aadcfbc26e098616095d64b2f6b"; + sha256 = "2e717c2b79dbe0dc3cd5f76f9a119638964b8fe08820b490252f5e2c5df16e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/el/firefox-97.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "475676b56b462193d6dd50932893b039e6826d247abf2d46a421415bd19a6c68"; + sha256 = "9f185015367acf57ea80bd4ab3ce93cd468884b5995341adfd890ad7a8f79dd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-CA/firefox-97.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8c50ad38302dbae2d6737f6a03bc6127c850101c5f17c8a15b85d157b6b39ee5"; + sha256 = "51605d1fbc4644ee6b13ca000cb04248e8ae0c63ccdafd3db5ed24e518f42cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-GB/firefox-97.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e48d9aa35fe906f6e6d99eeffbef212730c15a3b9d5a7090dcf99e3e47eda9ab"; + sha256 = "2eac6e8c38348c508958940f9bb76dbd7c9de1426f3fb46d0ecfe9ed3de3e9cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-US/firefox-97.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a63d28ae61926c0d7447f57d4e6fb514401d560abb50ce787bb6bd0e9b7b820f"; + sha256 = "ad296c84895b006ba555ab2cf88bdbe5c38f759dc3de3285160851a951017c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/eo/firefox-97.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "94394906bbe63f6dd414aa6b0739dc30082128e0e342fd408d33ab99cb01b9f9"; + sha256 = "c7cfb29ad0e7ff34a5b7ca9df77a430133cc0e23ab343b81648b3cefc91929ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-AR/firefox-97.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9738031b89b434127af39f20609b31ba767a004dc0ccf5d56b965165ab91fb82"; + sha256 = "1778407785e942b56767a5d44ceba1e64a6ba7610f2e37ce1b3c0d9006e8770a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-CL/firefox-97.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ceb4fd38b2b81b16f2faa95995b11e760dad4e710cf4435e6d311245bd6cb483"; + sha256 = "0980c00a7e3dd353fd62b0265c930219a0377b369d02223589451a950a5449fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-ES/firefox-97.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "37f94ded6c285c01300ee014f1a55d955a70b980647b8ffd5a0709dc9df34378"; + sha256 = "e3d0a16e79302b06dd4c5d5bca684481a4a8e23a41ac57b5599fdebb80cd28e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-MX/firefox-97.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b989f57bc1439e3204c912321df33626a9947691e76cb8bd22fb5bdcd77a86a2"; + sha256 = "fac81aadfc0b53d4ee796369ab5f3d20195b902ac3712ac23afce07f252c81c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/et/firefox-97.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "757190b1a6de3cb7d44c005f9b23f745fb67f0c247956007f3ac269d494019cc"; + sha256 = "5e5136778ac41a749ecc2c3b3d9600f52a7384731d1210745baed8a2dd609b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/eu/firefox-97.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "092f0378fdfa3fe44f19fc71543609a8b96a9add6f41324d24edf7aa7b446d36"; + sha256 = "0454dbe09d19df75d96f494c83ddc64a09ee56914edfcb9604f5bed1cc082dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fa/firefox-97.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c1d003bdd9f21d6751de57b1e4d8b1057082f48260a94a732e3a3ae180ca186f"; + sha256 = "4adeb426f43ab52e388d20e47de344da7e4b9510f54b6c35249154bad90396d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ff/firefox-97.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "af04da4c9528145e7b14bdc5283a41422704c0302675703a84a4bc2b42f8139e"; + sha256 = "59595e382c31d74b76436a0e9db60e2d387d0ecfa79e957cd9fa5105d01ac43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fi/firefox-97.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e3f7285b7d3666155863bd7d89bb7cf87008b755d34a7b5b04ec63425f7ed6c3"; + sha256 = "79878a6fcc291dcebb3bbf73ddec2592b9037ab41daae5260eadc5da8450a13d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fr/firefox-97.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9fa04d611d74ba0688ad7ad7441759015724e61d7303eb211b7f7404603eb1b1"; + sha256 = "370622eb7a2a1d35f7564e118884ec9897a0af8bce74925f8185923ca2e3fa82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fy-NL/firefox-97.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0d017580e4847f644d8b4b8d8e90aba0a92f3b3aa436b9de68f176f7f3b00cb6"; + sha256 = "18b08369f2808970c48a7a2bb83562431ec983d1d8cc87238d67595475e91f99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ga-IE/firefox-97.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "73c602f8b41a5aefaa04646065197fbcad2e196c94b1d1537a019ebe33590a6d"; + sha256 = "82b9eb2e68d832f2494d95b583db9eefa0cb926843cd27ea26acb18f4d996f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gd/firefox-97.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1c9a41012983133bdd743e0afda81d7c752b04ac2cf73a7c4daa662d9db91c8"; + sha256 = "2a95b87a4779f6f978d86bc4e1b62b6e26c384dcefd591a9fc67de62dbc743bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gl/firefox-97.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8ca8b2e7a3549e1df2aebd86bc5192d6ba0b14c2581802f1ca06342ffb771ac4"; + sha256 = "337be7c5c81988f2d14d455c9a2f1df9d70dbf6748f0e0935ab8c8adf478d320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gn/firefox-97.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "10acfa3beecacbfaae592dbce92e72dc220cd27503334e28d3108846ec012e00"; + sha256 = "798c829b199f19a94a2133d1bd90d1f89d9250a5e48eddd48517964e7fe2511a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gu-IN/firefox-97.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d2ea8b9386be163260d4ee0940dd80c4fa88d235cef7470fe9859fb18b5360f3"; + sha256 = "48eae1301e522a180b8e3cf522c1da4716dc98ac6199358141254c93d2e32229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/he/firefox-97.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6dd00a7a9518868ce35e92e22951fba8e45690ad19afc297c82ec5d43690cbb8"; + sha256 = "ba205d1076d9a95333e4472f3f2fd904a523838adb2db8d9e1b35da9c3bc27c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hi-IN/firefox-97.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fb583c15e2f5dba0c8c19c197f4e4f83c8e59ebcf568d3f52936bbbd4733830c"; + sha256 = "813cf75f2362e0b482073591529eed3ecf53c96868c677a0b8643197725d6a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hr/firefox-97.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "07d6ded87285b2192f3668cbdc74b6571e708bab6d77964aa8665f1940722ff4"; + sha256 = "36fcc3a5a40132658c8df595887875f84d10020b95fd45ae04ec7e5335625c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hsb/firefox-97.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fcbd4351ef9a4c3ea3bc290bf17679f900e73339b63d10ccfa2c554c09497bf4"; + sha256 = "656d24f9b2c771f6faaa0595d67c1cac40a997248b13291ec5f1f7cf578c9448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hu/firefox-97.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1fade975a0ab75308b281b556c6980e81fc6a4c540746142534401e73323d9d7"; + sha256 = "0c29e97498fd60955c02cd231acefc9411b52c3d10ae736f4f6cda447cd3e08b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hy-AM/firefox-97.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ac7d7124aad964783b65d9d7de037005fde865a7922cf22b9e07f44f36830032"; + sha256 = "0ce2b30421133e682058d38d61145839477f268f9b896d9c57d0355edcacaf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ia/firefox-97.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "cda3d476e07f15cbdce88225d0b7fe785841d56327c63a53920dccff9ec8bb4d"; + sha256 = "017d78f171e756108d4b19c620380f093b33cf6b963e3551e22ebfc89d3e3045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/id/firefox-97.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3bcd1f707740b56e345c34dcb24453d33d9761eafeb9b3590d5e74e4558b5f33"; + sha256 = "034e4f54181adaf70a6732fe568c8e8e775a171bdda9bbc70002a0a23f49b9e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/is/firefox-97.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "027f46db78d1796fa3ddbb3ec0f823e0a9e3677ca1f7e49eb1b9299be91c74a4"; + sha256 = "b87b498b95ac5c54df7acb746518d74c7de7f66cbae0a186d20a433ad84ca756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/it/firefox-97.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7332a7566fb4f8748df9afdeaf5aa4634dab42cf63f52cc41cec13215820afa5"; + sha256 = "b90d484ab42c02f5f151f242dc36e4b83d1ebde15b87e2d41e809138a8f921f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ja/firefox-97.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "c485ee96c2e6e0f0a508c99b2189595289f3858464ca2c48301ae78bbc59b299"; + sha256 = "06167f6cd79dd32e4292e2ac1269386119478abc9c0d8689d8a4ab4785bc2ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ka/firefox-97.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cd5b723c422e01d70856dd851337d719170585146029119f1490feec1d8ee188"; + sha256 = "9b1bddd0afcd3b562c48838027ca22741f03f4ee8bea2a619bdd1a086de6a1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kab/firefox-97.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "df540b3e9207f174cc6a280813d09c23abea18c1af540b9bc7e1330a4920be9c"; + sha256 = "82490f5055e81a243172397fd370a9787aec2a034f73dabc8c0a607dd9650293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kk/firefox-97.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1d6ae6bdfe89de470aebfff046d0ddd12dc85f4c7b9ad8931b8bdb9da7917906"; + sha256 = "b2637ef860d818be2e4fe94f520a4051813a0a72ab9c18888f7ff46d6f572eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/km/firefox-97.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1a5fb9460b33db9f32000c96ccdcbbe1d2fc3fa177b2cfaece1dabc514e3467c"; + sha256 = "00377371bf242b579a38832d14bc0cb005a085b65bb1cbcaed95bea1bdf6e885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kn/firefox-97.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3c5766b4c29c699309cc8191fb1aab01852db29467c38ef529704c54d9087689"; + sha256 = "79462373ac45c47ec74fd73ce6cb67124f2b30ae1536c3d089adc160809d4ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ko/firefox-97.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "08d9a5999a9b10fdaf9a386c9da99ec040200f2f19286cd7ff8e26de95955f5f"; + sha256 = "6e68582fcbee036e815de250c3758d6f5f64f05a522263505372a71efa9b6a29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lij/firefox-97.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "925ea94387cf5f07b053ca5b25dc2a50b0ad9f6372509e91116fb6d20675204e"; + sha256 = "e4c65f4dc771b0b82626db51388e048ce1685d0141e0602bb03b257a6c7e8a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lt/firefox-97.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f062e05e6fb52a42f813428be5be582dbb24b46f3379aa0975451bd029134c12"; + sha256 = "5d27f70cd772512268f0b2e0375732899dba624aa06b8fdf7991870e960323cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lv/firefox-97.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ca08ec6516a07aef0404716b0111df6941b9b167173079397a013f93db23e8a2"; + sha256 = "3481e2f2d6eeaac8104a42557bbf81099e83fa1f6fae83faec7d98c54def051d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/mk/firefox-97.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3ddc7afca0f7030fd667f345ace3105eef1126332d18f20c7221596704eb1196"; + sha256 = "876eb0ee59161f1ddb72510373f7050883cce63d99ce167039f2d6da6f4bfd16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/mr/firefox-97.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "684d22d5841abcf6c107106966568e6f7476d15e1dac80447721836c4a20a71b"; + sha256 = "213f2fba8f6e9421c1b818b32f9da7608545de2c9a375497583cb7f3fd7bb021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ms/firefox-97.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9630d0e0b4466593a59efaa383d6fd0e9c08887959e0b851f03aeadb5c64d43a"; + sha256 = "f55c1c63518f027202d12e9631980b8592ab7dc9bf69bedaac615d21bc54c93c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/my/firefox-97.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "2bcab7bd7e35474466c3b587991cd8a62a18a30c14ea489d9c28932e1813db5e"; + sha256 = "7d280b786459220037395d140dd248da4c5efb6b7ddf5dd995e15c190103160b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nb-NO/firefox-97.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d6c4f2ce45109e37ca35c0fab316fc31b849f256f4745858dddf519b27fd8e75"; + sha256 = "4826da52357f84c1880964c0c387a83a178fad365e427a80e14452a8914116a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ne-NP/firefox-97.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ef96102307ab270615166a9feaddf0ae047d2c8a18d85015be7f388d00ad3cd1"; + sha256 = "d1f51d93f6fa8d0d467ea85331e4ddbd3b485b6e4629c26a9a3e4347db957a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nl/firefox-97.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4ea9eccaa1c7d354cdc199b33fedb6a7ed07400f331d33357c69ca7c2c654dfe"; + sha256 = "a6092114a7d6b58c66874ff1c77c155d2c248c8574de210cf4111587a4c1e21a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nn-NO/firefox-97.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "59045e5cccac7dbc125e3fa3f8c9bff7b5d8b8b0e8f1e696f5bcd633bf9353e6"; + sha256 = "22bed8fd59c3138be2e0c32bacf3ea4c270c911bb13b269903689c6b44b92f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/oc/firefox-97.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "cdc9c76871be181f86871c55bd6819de9539bdcb11450cf3bac419f4bd44185c"; + sha256 = "4f932b1ef1689f4c3733b47176d5f1b4ff7ae3ef0e9448821be5ba545a3bd80f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pa-IN/firefox-97.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "aad979dbe94c225b4255ff6b7b78097f8a60ecb14570517eddcd7cbbc553a9bf"; + sha256 = "ee8ed5b62a3af8693bd9bffcdd371e214f1d8e8d8f027021fe0dd0ced7febbc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pl/firefox-97.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1f1be85fe26c4a55171f7114052ba679c405e731b3db7934ee2ac35323f095c6"; + sha256 = "1030e47fbe9b56d411aa7479645467a2d7d69d2547785723ed6eeb71287de855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pt-BR/firefox-97.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "588698a09d7320027027ace6196f6430aefe315cc9aae745f75568a062d6de6b"; + sha256 = "677c9c2320e5c76b906bf45af9af6dc06ab6643d708842d5ec53be7879e410f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pt-PT/firefox-97.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4cf0b84bbb4a5945ea787ca0f3d4da56a12073797dd603be29e408772a70860e"; + sha256 = "713454c171d909cb25e32ba5e2a9a5402b268462440d3d1c6af6c381aed81dcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/rm/firefox-97.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b267cb45b84b114c266551c4863bfb22db9ff4725c0b6b9d39616e0b01f71e86"; + sha256 = "e5f32064d6466cc063f42ca2a8aa71bad1c8416296e43aab51ef26483cf99e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ro/firefox-97.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "26a6ba053a270db85fe008f72c23b905072a84c27815131d1a3af90fba0f3518"; + sha256 = "029254291c06bdfebef637336f3e369d1225698890deb1d3a8f1c22af8af96bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ru/firefox-97.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "caea6755305f8f077fc82895343c01a7e1eac0e1cc70faaa1915bb88cba01344"; + sha256 = "cbba6fbd7badc80ea6c027567197931c1ff0d0954bae7afcfebe1aba8ad1a5c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sco/firefox-97.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "eb249baafdf9d54b61e923bf3f23d2f462d5026f4b81bacfadd713bd569d3255"; + sha256 = "42c7008ea400a4d0459dc640d62ffcd53ff7fb9cab4ddd2d256fd5d904e7a9d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/si/firefox-97.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "44a98bc22309035b432c3f01c5f87d469df3f2bee44c26f54f507f10b7098908"; + sha256 = "2a1f68f377b399effa9ce5bef552999961f65bc9811e348e67df8219b1f8f674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sk/firefox-97.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a81e8f814a2816ad95414c6e43acf55d88e4ce0757de14ab163f6b622fc49d41"; + sha256 = "1b8a84779f43505eba914c8200bbd081fc9f8733349b1a1a111e841143a17b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sl/firefox-97.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a2b9f1dd69a9a3fd4b5198280462d06b49d5c63fd101865707cac6aa6fc9581c"; + sha256 = "4bb3560dfbfeddffe123daef7feaf2cca07fefd61165b73500e10fc8b5b19725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/son/firefox-97.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0033fcff083aa29a738799cb9bb3d32eeeafaaa3a1d41c422048c89000a9968a"; + sha256 = "7e34dc2ba0ffa089f2a33e9a03876233aa229c3dd196a13d386fa2809a75f0cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sq/firefox-97.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3614b46f72a142655f58c0577345a772350ead46af9060cd20e8918f517c7cf4"; + sha256 = "b463cf0e58785d24e1afe41ddbcac913fb8c6d1183d0a42fdebe4c3372c1ff77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sr/firefox-97.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "034dceafc44b83ca9d493f98645bd0ae45fd513f55f20f0de85752679e39c570"; + sha256 = "293679d7963bbbcd56388076eafa71a8642094826cbd0852c127ff2f6f1af6e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sv-SE/firefox-97.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "aff9dc0399629aef20dff6eed5ecc7664cc8c83b53614b2cd011db6089262a9f"; + sha256 = "76ea065441b99bf4fd9e19063161f46d553720353a301e207dd2f2a4aec68d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/szl/firefox-97.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9b6242e30b948507978f96180ec6d7d5921e32657f41fbe211a7c254cb11777b"; + sha256 = "8098c6ebc375223a64b377555634581d9674e8122e8fb35ffbce4d168e7d2cc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ta/firefox-97.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "368a48fe15bc7ed6359cbbba817b47a99a583cc3ce91d2d98f0387d3a9880a95"; + sha256 = "65a9903767a0af7315bdba205c4f5958b6a8b62667b47c461776a42327034f25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/te/firefox-97.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dfeadd822000e10c0214d05c75203a6e9c98c4bf20d65377c35ee8d485a2707e"; + sha256 = "c472245fc0fadc10317f6cdbbfb16007241ac88629f89fc0140ef13d86a34823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/th/firefox-97.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f1932432028ef648897e64bf033bb3e8984100052ea52a9840d000272f9d5eb7"; + sha256 = "45bbe61e8dc4c14845348d9d27c1b9936d6457ae2f8d3e469bf89d948571a54a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/tl/firefox-97.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9436d48c6b56c7b765a4ab6ce20bc12f3e5241691edb3b1517fe27a3a1fab6a5"; + sha256 = "8eab5ba98fd9009016063c72e6bb2697a35144057216d783f68f25bc7b2cd95f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/tr/firefox-97.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bf0d0808d6d5f880bf382e9d440013855a6fda82275cc628833fb8cb694e4f6f"; + sha256 = "3353d52fbb87f2153b47bc0b7418b59c7a69c9fc485317c798dfb46c22576b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/trs/firefox-97.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "546416fc106774a28b2234e31d5d9850ed4708a2e5be4a4231deb28f4544512a"; + sha256 = "128592aeea8f05a45de19775694c6328348c6e9c379c87f74d3e128f6d2f24c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/uk/firefox-97.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5395cb322632fc68ef84241a75786db589863709344d5dfa9cbb650bc94c8f6d"; + sha256 = "8b6dc07b28938823bad837c4afe35974162269b18603558922e5cdbfb8803e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ur/firefox-97.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d8dcdc4d95646392582904a29946f652e670bf276dd1b156e5b28477f4369e50"; + sha256 = "55cd1f091e19393e20286c841391276518f5052ca276212f7fcee131cb8afb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/uz/firefox-97.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7b1b8b9e9efd430ea5191d3e30c2b28ef28f9fad9779a4d65d1bd653c575986a"; + sha256 = "2e047e036591bb43e402bac8f2fb4c201ca20c98954516899a05a1f81fdcfc99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/vi/firefox-97.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6ccc1efad3f2a57b365195afbda665548d82d141f5143beb04691d995e0ad1ad"; + sha256 = "5f7f76c7c18697154b42de673d73536c5f464c31400c40d63ab21fe63b0a3f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/xh/firefox-97.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "4099f3357f74bc5443ad59ef72bb1d1881b1d96965628544f72eb3bf72a02a36"; + sha256 = "9242eda24dc7f713e271c2d510ff0b5b6b9b4245f52c61c854ce9027ddf0aaf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/zh-CN/firefox-97.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9588d9eee65b7389c91ac43782f455169889742b2996bce8306fa07075f1c4b5"; + sha256 = "d6747951a775d94628e132ac6ae4d42be832db68b8acd37e88a6704265f96492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/zh-TW/firefox-97.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d4f9228777a8af5e68616865fcdbf522cd73d69164ca0936098bbf0534911413"; + sha256 = "0696bf38ecfc74515125bae5e78488d3791c96d278e13a945c8fc4ef22f29795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ach/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ach/firefox-97.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "bb0e66383954377252fe15d1e3b251ff0e7ff518fa8d817f4f26b18449e8525b"; + sha256 = "2192bc876e5d20d07dd7bce8b1cec0a7de9fbc2792bcda0cda56f4e6094f0780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/af/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/af/firefox-97.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5d73dbd6f2cd49f79e99538ba0b4247c8c29c92ce3417e6ddc23b89df59d4ba2"; + sha256 = "cbe1617bc50bad32cdb5d509ddbdcc06ee29446b4aebf9f7ff43b76a3c397c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/an/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/an/firefox-97.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "43b1ccf184fee070ec1a279914eda6b25ab15f294468b524e4c2a5e975e7c818"; + sha256 = "cf8fd1eb1381e799c691bc29e7ffff12d7b680fa3e581e74450c4299b96c1f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ar/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ar/firefox-97.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6ef2f6bf6fac15b194a08aaec137adfe59ac7a8e1e06eacf88328dc1c917c994"; + sha256 = "e9c2a210cfd311a4150e2b669f28e2cd402f90e3188a0025a6c10784ecb599e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ast/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ast/firefox-97.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01aa7a8ea0263ba32f0c398918b184cb0d9f588df4330b16e37a8f3fb1efb165"; + sha256 = "46f6fad024ae9f936e87817ef8c412b5cfcec136bc20b81711999f3d0fd80f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/az/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/az/firefox-97.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3605a671f1752f0ba3499720095b66a7d058b5a0aeec3f864d87d7027121c970"; + sha256 = "e949fee909684137ecf11d708d7792d567dd2626ca85aa65553aab798ee22158"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/be/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/be/firefox-97.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9ecdd7986a2b2b0c28ec11eab24130e4d35c8dc96e9fd95bebd0fd2e724e38ef"; + sha256 = "c722c2207d3c517d3990b9c391279c8edf64c8d2580a9aaabbeaeda068187bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bg/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bg/firefox-97.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c66c13d707aa0f52154061dd6d59407acd1bf5b1a29284da8821c2abbb2b02fe"; + sha256 = "9d160390573d2fbe8bee16fbf02e5aef8b39cdddb29b4659d62d8c4cb3b7ca9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bn/firefox-97.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "bab8e1f9004caab4f2a4ba0dbfa22ce10957b5c2a4adf52049d64953200cc052"; + sha256 = "07b43530c11a8c9dd17d2add98e969543e3de5641480d8598c8622a30b8d0c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/br/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/br/firefox-97.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "07f177e9396567d4f0852c68b2080a04ac2f00c38c3cb0c1bc0fc4fcb3b629f5"; + sha256 = "d4fc63b59f15a19f1a8096321f97250e2c62c545e1ab4376e00dd37bf926358b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bs/firefox-97.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e9fd1dfce60b27dd8037c144810379a2526c4d270d9c2bb2536a74df8be7a586"; + sha256 = "2926112d25fb8b539c64150182c871925442624588214428c3404e172408db65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca-valencia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ca-valencia/firefox-97.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f6ae71d70746a7c56ad416543cff9ceb4298dfe30d1bce4d72ea695131ebad95"; + sha256 = "84aa8decb3de692e7bb0d0ee81776e97d17ca5e5d7acb26e40974864edd97749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ca/firefox-97.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7b12613954b0e6b81ed7fb1fcca7099dc4500a72cec7333dd8de6a7deca28820"; + sha256 = "c3d5e497af8a54aecf3759577a84d0f3653f7a23482373e76c7357216dcf91ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cak/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cak/firefox-97.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b18f916d3eec4121c7a854ca2ba2ccf5baecf53d7a173578e19c3c3c50aed076"; + sha256 = "a6c9ca50b2736f938c083f77256e535f0292c1185f9953de4b85f96e38319cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cs/firefox-97.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "56afa0af38d7ec85b938a961363b781d4980ccfeec9945f0971be201a21b1cd1"; + sha256 = "09d99e99bf9de31352331fc8785b0b3d3780a2bb3b204040796cf97e5d122d89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cy/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cy/firefox-97.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f82d0db8338a0eb4cf5f180f4982c5c7db7db4b9fb953ec496aa2e9961966091"; + sha256 = "49e60a72cfe50cf5ab611b3ad8f138591450160846af4463932786885af84d6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/da/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/da/firefox-97.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fe7def9df91782a3adbdf02a4deac85ab07caa4f378f695e2253e0eccde3ab34"; + sha256 = "0ee8afceb0cbeaf073ef55c11ba689a150c22b3d0c2f195cb229faa8a9b5b649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/de/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/de/firefox-97.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1fba10e324128c2d30b9a9a0489f1f065bda575afc7dbe0c6625ece2b96b4bc7"; + sha256 = "e26b2d1eef2534cf70d4f179fd0588d5154499a8a24103b214ac12c0b5a8c8cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/dsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/dsb/firefox-97.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3e43d5c0d27290b023c7e53a48aad5894474d9a33a544a20cca4893fe4dd3267"; + sha256 = "aa18dd0dd29922806a9cb5898b4c96288cbab93f167e811a9dd3c74932078a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/el/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/el/firefox-97.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "71864f8294844e051674f20d49b78f3b129ae10f7ae93c4bdc4e194ca6a586d3"; + sha256 = "c716a804e8b2742e9c429605239857243776aa659c401faadee69768bd0291ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-CA/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-CA/firefox-97.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "845713d2c18c1bc029509590e6156edb2166dd7bfc8e5a8cb9e6092143bb8193"; + sha256 = "eccbac7e72e1e71e09836e029d898e8f01edf38d32cbfaf40012891cca7c22f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-GB/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-GB/firefox-97.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b5b2f7d607be95cccfc6dbc12298333e5f261a9cb27650dff946ea4246e87df8"; + sha256 = "9373ba9afc767b7d52e3f7183250fa315315a6e845b9700019509d2f623f1341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-US/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-US/firefox-97.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c736080050a9715077a004add55dcb3dcb3be891d5870939709096bc81195eed"; + sha256 = "6d2457c5d25ca4be784d189deb3134421c2072881412a24f732d2853b86e0bef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eo/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/eo/firefox-97.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "38f135a137826862f9319b88edd9ba0e41a7c57f7de3603ca23d5c6101b2cdc0"; + sha256 = "4d0e02741eb10eccdb9300b0ff6f13674a74bed47139cd786e9bd7e4315970b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-AR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-AR/firefox-97.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "63856d08aab14fec8b28aa6ad6f765aa43d5bf52cd1da5e48aa3c111e13be60c"; + sha256 = "6a8c963e0860d89a829aa27acc32fd2f79bf89cf87534c837bdcdcd9fb5e0157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-CL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-CL/firefox-97.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0bffa72431868aa53835a67b18a257e7b3083da778182b13f723f68a38478910"; + sha256 = "8472ac2735d2142bc8d465749c247413362637a81d57d68bbd15851fbe05cc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-ES/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-ES/firefox-97.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "11adfe391791b2e17114c72d984db96586c70102d43563f907c371cd85c89b03"; + sha256 = "922d5e41d37b98226a2969ee51079d7ab584c9522234188a97c9aee1feb31f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-MX/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-MX/firefox-97.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6b9360899c575c665e156dbb8a3f20b396bebb742f14eab9957f30f1dc2f644e"; + sha256 = "082db8cff7aa39fead4764f497ea27eb43f761928d5ab6602032feabae599a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/et/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/et/firefox-97.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3fff6be4dd8d62163cbffee59d2d4811944f89b452a57192b3444515dd510bd2"; + sha256 = "22b7484208ab90ab3c145e22688f945764d7d2c3321577a8eae339f6a385dc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/eu/firefox-97.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1fb5ce8792f92d810f170746c61133d1835513dc644c6db88f1a4a6d81906815"; + sha256 = "25ffb27b43aa19b0bbf7cb8205a26744804d9ad995c05121c946bbbf5a9cd426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fa/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fa/firefox-97.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a69afe063a18b4f95fef028c584a46de1246fec45137e394e4b4a6f711be84c5"; + sha256 = "65b842820b27d8c721d00b20fe349b7143dcf512743ef24792346be2945196a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ff/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ff/firefox-97.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f1c3797c11b975d7a2feeb03d20cadd89396659c3661f7604853d9912a5b6faa"; + sha256 = "c48993b690dee9cf52cbfbc1e9dbe050a7a09cd31a0351727e761232f51af521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fi/firefox-97.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d8c628c73ff53c5883a8396bde4bb9b931e1dc7ac44637e9774b3d5d3ecf6b06"; + sha256 = "b2b019f93bd46e7fda9f9bb587bac5b6fa6933a8a438a56651c1b357a1422ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fr/firefox-97.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85dbf4270eced53b4020d7a269a9d9ed4e55fa7251672b9c32feb96d6336b110"; + sha256 = "55f34a1298704c4e35bf3bbb6bfe5ecd723a2266cfa326440a53dce7800fa4b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fy-NL/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fy-NL/firefox-97.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "30da6a888702ba5060e461539ed51390014c79b55c1358e6a8b76c80c335199c"; + sha256 = "b24917d24a66762f190bd3de0fc4c3063bea6b8367bbe0cb7179a0403dfd34aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ga-IE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ga-IE/firefox-97.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3c1a33c4d7b3e3161f2b07ff95adbc466a2e9d718227d786ee6007318730c1a0"; + sha256 = "8b492d36f0031705cea67d6862991f1a78ed2678df96f7862b97f13f30b4f7ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gd/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gd/firefox-97.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0ffce6d8f9e2d0d1b84c2c9b2ecc49a1861f88356c5b37d75522d537364f5208"; + sha256 = "3ddece6e94a6ef0c26f2204cc5442a00f5bc4aacd3bd87b2f4085aae5cf6d519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gl/firefox-97.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "31fb23e14aa007cb6ea74b5ccd124d51a1d2c19cb6003d693afff07e83640666"; + sha256 = "e0aa1ea385d06324b174eb534744e16293e9e2a9ec67448500f5f85c1e78cad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gn/firefox-97.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "042b2c8e5652f2f9e1e3cb01a4308cec100680d45acaa37babcf33b8bef5512f"; + sha256 = "e36c9a22f3bf6047cb8d697b5e1e9cf23b9074d916dc7743653d9126c9315eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gu-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gu-IN/firefox-97.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5052d0c6a28b1c83e1c38b771f62f3c973089ccbfd048d0e089c8a637a80d218"; + sha256 = "ee328a70d051a7abd6c2d9ec7654eeb6b53dc0f30d109e1690020b246c7802e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/he/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/he/firefox-97.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "06a78cb3435dc6f8dabff279ad1c69f6f4d44c5a8e56d04d38dbfb046ad42fa8"; + sha256 = "93598f5edcc207eb20796c52629eab98a9422f24c2788a65dd45c92498352123"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hi-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hi-IN/firefox-97.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "340d637d0de3df62ab79e69b3465a154a80e47a4dfe2b48cd949874457955cbe"; + sha256 = "9c86333eaa06e03cdfcb3b5e2b7feb5f740825fc59a1b115b7a9180c5cdf71af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hr/firefox-97.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "526fa7a1bf5e3e3b32f2fa61b8d28617873aba9bf1bacc5e13533b0621df993a"; + sha256 = "1b067012f8b23c0ecbf0dea390b8cfe7665a584abd3d5b2dd5706d45de2960c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hsb/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hsb/firefox-97.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4443703e0b590e66dc4d295b1262d61f91cebb0a59ef6c246348a4e411663398"; + sha256 = "1b0c71e9822b6a61704118bbd20111f3350389d8a12d52b3932383bf85f133ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hu/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hu/firefox-97.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b2b1be8b090734f1069f7bd78294072bab28920312aa34125d02213a030bc9b1"; + sha256 = "039aec5700c4c43583637f331dcf18ffd7be59884804908a7cfe85c29030d626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hy-AM/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hy-AM/firefox-97.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a81e4add5314774f19fb514b539bdd7e12b907a4faf8b606c13f7dac8461e3b6"; + sha256 = "0edb9c11fa2e1f4c0f73c259d8943120e7f7ffa88b31bfcb796543b7b9e1cfa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ia/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ia/firefox-97.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a1ead289cc491600b89d63f96081b21e5f8172936023e42b5d949c0d5aea2bbd"; + sha256 = "53da2a2c4b3c952ffe14915fd984342d023e0a01f348d41bf747f2e338b05798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/id/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/id/firefox-97.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f56eaa86629a013f60c7af973a844abca72cb7ad236e02479bda9d1aeeb02b32"; + sha256 = "18b9041709dcbf3209e1527a5d5bc0067ad8eee6031dd76ea40d4b88908fcc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/is/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/is/firefox-97.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0d762f8c70bafdc9d8155572ff71ebbb0dfd9d83388298196a87ad130f8527a8"; + sha256 = "037eb31ed338a220054b223f875f58c020178da7b06dc93c89e836010a5ac5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/it/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/it/firefox-97.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "54a79040a115b67cea2b912fd905d8acee05e737702c778628fd10282b27364e"; + sha256 = "f224b94d31507276f2bd220cdc3bb476dd6aff5f50afac5c57c0b1d42525f08a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ja/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ja/firefox-97.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e92f3cf4d7f2f0e26280d814d6bf26f14fc2f5d8923451cbb6075607ba4d95c1"; + sha256 = "4856c05bb62ecb086b2be18236917554f0145374782bf03ee32e13ceb669664d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ka/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ka/firefox-97.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ff89c8ecc80897ec8acea68de166ae6f626f181fc7f0c1d30ac5208c4a221eb7"; + sha256 = "bf42c9959f08650090525624cfa6e301c8c08bfc3f112ab39362b7729ddc12bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kab/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kab/firefox-97.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bdcc2807c9ac16d6df6e1f35e2648f7e1776dd117edc1731d24192eaee5f9661"; + sha256 = "8529eb80d70cb5a76482ac742ef3336c754e733d9c9b7cb80c6b9193e4a26983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kk/firefox-97.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "535bb672a95a37550779c84ecb5eaf98f151a30123b2b7a099b7940e8bede683"; + sha256 = "9a4148fee4ef601129d0d76733d94efba0e1fb69daf75f12243ff687852425bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/km/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/km/firefox-97.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3e60008c56da46e0897c326a843871d63fe0e534487f4a94f2e398ea6c5377f9"; + sha256 = "4106ef9adb0ad0333a551c57c24a5a1a1c13d912d8ba4524ac0bc95e87ecfbf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kn/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kn/firefox-97.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "90d8c47a1cd42b7bd4f9e2c04ec6bfa701fc978a6ea680fc5e48bfd4fa6a727f"; + sha256 = "5f6d6d22ba1ac0e0a9e74fc2299e8fc0f0329fcc9a814dc5807fa80e6870fe5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ko/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ko/firefox-97.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d62427eafe143f3d2aaa1eba6969358316b8c76c7fe926d8fc5985dddc588e7f"; + sha256 = "e03e8c645a98277d8a7d9e49dea8ee35bf574e331909ddb3f47a113834e0fd63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lij/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lij/firefox-97.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0db93d63e67c7f1bae536d425dd1789b0c0d1737fd23e8d0aa0c7b66f4c958a3"; + sha256 = "40f5caa8e5393c6832632fa8539c3c8859c05b96bcebfd7b098e81020bf14c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lt/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lt/firefox-97.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ae3cfea73e03c61afdea361c4b23408f7c894197c4ef370286a653d35e0eb406"; + sha256 = "5750105121d1f2c3192407c9859c5bba10fbae70b79b4dafd03a5fadd7a582e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lv/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lv/firefox-97.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6bb0a946109cb8316a1d3b412602b590caf4f6a22fc7659fc43d79c0f921acab"; + sha256 = "201027627af36b8062352d790255952cb3244a6d4ec50c40e70375fcd754fa6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/mk/firefox-97.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6e36851e9c7b14e8c180ac9b715b245ec627fd2c73dbb4adc31219247696f658"; + sha256 = "fc67d3f4524c50ccea04ef1d28d1850c8ce732df6fd80208f3b95d0f5bc97b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/mr/firefox-97.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "68678735aa1fa850cc30445e71fc2589f32d3845238a781c96d62164b00a1da6"; + sha256 = "a966671ec7ff2f880557f4847bd652ba98aaa08ed787755ce88ea1e80f2ed06e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ms/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ms/firefox-97.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0dc9802f1ea0bfa4e2916dd4a7b02b7aaa5cac0238aa4bae62bad4eebd49939b"; + sha256 = "82c4358c9df915d6757fb2935289218d88083bae677881c883d6b626aa3b2ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/my/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/my/firefox-97.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c3fdec85d214fa4f85b502647f9f0f50e0d473820e69a4f4f8d5d24fe58e6cd0"; + sha256 = "91d6c81aaed53c8d218a1fea1c440aec8850926c53a994b7e4efcafb061daccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nb-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nb-NO/firefox-97.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "48947dd10062ebef8e9095a1938dbb0b5e24689ffd5f835080512612e93f2efd"; + sha256 = "d8773597a84212cb0fdd6555fd358dcf6dec7d97db9a6b646c083055b13765b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ne-NP/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ne-NP/firefox-97.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8952004bde5d731fe48ddde9bced409e5d2c46d25157542f3c72568b87a9be8b"; + sha256 = "1027a001f4586cf6dffc85e8fd7b9e8e7f70eacef30198b8a6bc8c5b70d1fcf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nl/firefox-97.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f2c7c1348dabee858c89b8aaf37e5cfcf0cd867f4e9b0587285aef13aa302a26"; + sha256 = "0add3e6e26b51bd8363b577f7ed09395710304dc44c9e584af2267d855d4584b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nn-NO/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nn-NO/firefox-97.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "bd05d1b619c77fbb502080f4862cbb715e628c814d8c35720998ec43d6c4920a"; + sha256 = "1c666a04b8ec8dad7d56d9390a565e9a95d3668687e348cd83a4e9c61d76ab46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/oc/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/oc/firefox-97.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6092e57f1d6bcaed08e5d1acdd15d9fda0430f1c0073a48fc38f8a73578f1fba"; + sha256 = "c1ccfcd6bd1f5e9cd5713cc70eaa852f111311c4e6b2fdafb081d21c5cfad8ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pa-IN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pa-IN/firefox-97.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "51bc6d1b738c12eedd1b35f829b51ceb157c65a25241e911e10c13289b92a5b1"; + sha256 = "17d4aa8cbd8915ebb36f5e33a61c21ac20c1a22804ebbde9af1e23bfb97bc8f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pl/firefox-97.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f286860bd5912b91fa62494837da2c335c4a4a484a164b4b999022c2813d5c28"; + sha256 = "045e39e9b4b5a8267ffa61aa61035fd9b8072cb5abe1c3bf55b5962ee5c187ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-BR/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pt-BR/firefox-97.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a1f48ba9c56f2c54899d14b1292cbb4e517482ba0552bf17ace7dd6b517eef4d"; + sha256 = "2fedcba08ee5bea1e3b96c2f505f6c8005858db7b3cab323c1af116da6d6baf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-PT/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pt-PT/firefox-97.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6d91ff36f186ef11ba70d604443b7e818f608dd6d667f49a7892c1a69e64bdbc"; + sha256 = "8eb62212fe9dfe210106d4cb294c9483f8beeefbb1a71043bea0d615e164a0de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/rm/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/rm/firefox-97.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc190575af60d5a09266b2296796978f7a37dd07b2709523b84b88499729e546"; + sha256 = "251a08a9662aa199df492c6f8301e888ec49bba30b36dfb4e55d03080796c69d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ro/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ro/firefox-97.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4193936ca7e10f01b91ab990ba0b7aa354c344a7749356bb9b30d251d46b84bf"; + sha256 = "72255f3acdaf1f519c2dbb644c3b6ad3686391884bca4babf5d16e3f42664b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ru/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ru/firefox-97.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f85ad1700117a99b8657d9fd9061935b77acfc4a0d7c8b3caa8d7c0ddf142a8d"; + sha256 = "47cc1e7e044be8c8e23d5398932770352482468eef09a7981de792bf63d5636a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sco/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sco/firefox-97.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "23d16650132fe30c6fb90797f744d09f21f16a0673821cc0c59392a9d2adbfab"; + sha256 = "d95ff1e2a6ed5dae1bc86b54109d32cb70997fd67a5d2509918acf162ad0f575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/si/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/si/firefox-97.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "44ec177853f6d3d72ce141ebfc25508df4c63c8b37265df4dfcac8b48799b007"; + sha256 = "1babc4d0daf943eb83bd0b6cec67f5fd82fa9014efbd1d828c7ef89055645220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sk/firefox-97.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4a31daac61e0ac3a729c5299dc5d14046bb2cadec61aad443fa4391a0cc99b3f"; + sha256 = "fc0984f13d0a01ccd17830855ef2c14344dc0d51d60c7660dcb25c4d8cc6c9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sl/firefox-97.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8ca7306d8e68d9943ae3dbeffe3da88682c4c22fa9974142b9f609c4c62b06f7"; + sha256 = "4978ff29f97455bca143b1b69c1da4edfb4740734853c51ed040621bd04d7fd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/son/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/son/firefox-97.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9c5c17a9f85814779f88f320030bc6d935cac0b5b51ec9524283553c36c751c5"; + sha256 = "e391df473e4711ff30c26fc3a6069f93ba7ebba7681350ba932c2af443052b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sq/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sq/firefox-97.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2c40123f37130de16e47175472086e5774598b5e6090de4d88e67512bf982c43"; + sha256 = "d2cb665ebda69305e9294e7f59c8321bdbf6995ca12ee0cf9730ae832191b6d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sr/firefox-97.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2ab762afa95e0d0baa3650e35612f4f56f9d4ddd2baa34f615e9fb7bf95353e3"; + sha256 = "bebc7b77b5b3a4f68d0a65f0901f4fe3eab30c9d0c17511de1c4c16224ce89ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sv-SE/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sv-SE/firefox-97.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ea00b75128a67638d67ca83ce9f5e15f4afe9eda1903e90cd6f27820117fcac6"; + sha256 = "6f70d748dacb0847197dd4b513a41056db6b9cdfa09cf05c85407f54c73bcffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/szl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/szl/firefox-97.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "88ac139760b68702f33ad02889dacbd31d3c31140f3dff763dcbf6f9e7f6adf8"; + sha256 = "691d0d47a0eeee2ead1b4ad6d68c30f57f716606081747c8e318fc6d124f52a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ta/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ta/firefox-97.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3828cc9dea353d7fb259fd57396ddd59b316fb323caa6b8b47f485a6aad8e1a5"; + sha256 = "799399db843a096b0a26f916662b774347559fc1e22f2763b89a409f346d859f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/te/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/te/firefox-97.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1dba53e1907eac8f76759b2fe0a5499c31c733dcd627193916e6d4ebab27c625"; + sha256 = "9470f20496f2abc22da792dfd2dceeffc1fcc5a7cb94c63478f784ef3ffe4718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/th/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/th/firefox-97.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "461a11d1a033cf9ef113f0d362484696b29ba6d52e7e14ec4a3015ce55767f01"; + sha256 = "9efeeb40b74356e5c6a9c44b702fead83c29eea0782964024a8884f22216d055"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tl/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/tl/firefox-97.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "572f60b9222c9a008ea23eb0f9c184fff17af4393e887cf2db871a7f86f74b77"; + sha256 = "eee74ab0114e6d43a92d081048d8b4a560bc6534cc40dc1f6986472cf1f55089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tr/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/tr/firefox-97.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bcc59684f7e6c6efa6df66fb2eacec8b1a59f0aa42f8bea86a7e0fd6a29916a2"; + sha256 = "bd085cf744b30adade22ebf1a3483468154798c457968cf28b2b6466dfd3942b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/trs/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/trs/firefox-97.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d97ea9fcc6ec94e168ddfe219f08fc202013e1cbfdf35e34749569e54f6ae65a"; + sha256 = "b62b22cae2b433b417d986f0e6dadb1cc9e18756e6dc5add12f3b4ebc579905a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uk/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/uk/firefox-97.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "49078902f54f5e0ffbaa93a7a797a7795a1baeb5cb57942afd3c6df38b68683a"; + sha256 = "039a1cb867a67776f5895ff5fe30fba423f90349dc3d414ffac38a1e9ada8555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ur/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ur/firefox-97.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "7df5518a9e0f8a82b61bba992bbdb4c3ceb935768d057ffa3602036a921b1754"; + sha256 = "4395013e4a95c1c558b7b56c3c5a0ad91e1dd71ebe63a4e3ffe059e55d0c265c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uz/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/uz/firefox-97.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6a36b93b799cbaca9a7f5765723c63a1e42c1645bad6ca2e3ee8dad8d64f3c40"; + sha256 = "05597062b24868b0dca7869afd2254f66963e1e36976d995d061cd4451514026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/vi/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/vi/firefox-97.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "da081f083f64ebe61465848358ac018ca4417104ec94911d39f4ea87a858d49e"; + sha256 = "15aef2b0666f6c2eb9b673e880551c1fe80976fd22c6462e52500bf87afe076c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/xh/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/xh/firefox-97.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3dd0234d0ae5739290f7236264500c3ead31b6afa9b00cfbf8405e1ca13d1a57"; + sha256 = "404d67957ac6ad847ba8983928285789d8d76bc39c4ca2864ea7ce61f4e610fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-CN/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/zh-CN/firefox-97.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e21e6ea94ad72b890c1eca95da2e1ed3f5c3b61ac56216092a7393c072048e4"; + sha256 = "1572fa6528616efbadf7475c587b163780d5b8ac2c186179ae9161b3557a5f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-TW/firefox-97.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/zh-TW/firefox-97.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e8eefb56597f20a92c839a7e4ccfabfa009de100505982a72c8088a64ecca879"; + sha256 = "da300411ebae5ada6030d116f989d5d8f1808c31ede8d7eeaf4b851330001f9d"; } ]; } 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 ca8e227664..d57839b0e4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -11,7 +11,7 @@ , hunspell, libevent, libstartup_notification , libvpx , icu70, libpng, glib, pciutils -, autoconf213, which, gnused, rustPackages +, autoconf213, which, gnused, rustPackages, rustPlatform , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , gtk3, wrapGAppsHook @@ -196,6 +196,7 @@ buildStdenv.mkDerivation ({ which unzip wrapGAppsHook + rustPlatform.bindgenHook ] ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ extraNativeBuildInputs; @@ -210,28 +211,8 @@ buildStdenv.mkDerivation ({ rm -f .mozconfig* # this will run autoconf213 configureScript="$(realpath ./mach) configure" - export MOZCONFIG=$(pwd)/mozconfig export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. - - BINDGEN_CFLAGS="$(< ${buildStdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/cc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ - ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ - $NIX_CFLAGS_COMPILE" - ${ - # Bindgen doesn't like the flag added by `separateDebugInfo`. - lib.optionalString enableDebugSymbols '' - BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}" - ''} - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG '' + (lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, 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 7a5c91130f..a01c09fe0d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "97.0.1"; + version = "97.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; + sha512 = "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.6.0esr"; + version = "91.6.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index b428687025..52fe1ffe2d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -27,6 +27,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName + , wmClass ? null , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , forceWayland ? false @@ -159,11 +160,10 @@ let name = applicationName; exec = "${applicationName}${nameSuffix} %U"; inherit icon; - comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" @@ -172,6 +172,7 @@ let "x-scheme-handler/https" "x-scheme-handler/ftp" ]; + startupWMClass = wmClass; }; nativeBuildInputs = [ makeWrapper lndir replace jq ]; 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 bf370dd6ec..00d0bc8f6f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.6"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU="; + sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4="; fetchSubmodules = true; }; 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 5013ca86d3..a37278bcc3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "82.0.4227.43"; + version = "83.0.4254.54"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0="; + sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 427f6bcdc9..21e86a160c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -96,6 +96,7 @@ let urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz"; }; @@ -104,6 +105,7 @@ let urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx"; }; @@ -125,7 +127,7 @@ stdenv.mkDerivation rec { desktopName = "Tor Browser"; genericName = "Web Browser"; comment = meta.description; - categories = "Network;WebBrowser;Security;"; + categories = [ "Network" "WebBrowser" "Security" ]; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index fbd0df2fd3..d7ba8808cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -24,8 +24,8 @@ mkYarnPackage rec { icon = "vieb"; desktopName = "Web Browser"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "application/xhtml+xml" "x-scheme-handler/http" 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 139bfdc965..df9bdfb77f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -19,11 +19,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.39-1"; + version = "5.1.2567.49-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "140idghryk132nyb8np011xiwzgh518n0fxrkjnnvi3c67shq7qc"; + sha256 = "1cyd789apjh71vzry2zjxb0c215yarfryb9jzxjmkfvrqg4g23xr"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix index f9be7e9ec9..9f43f98172 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation rec { icon = "webbrowser"; desktopName = "Web Browser"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" diff --git a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix index 757f39c5b3..064213b01a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -11,14 +11,21 @@ let generic = { version, sha256, platform ? "", jdk, ... }@attrs: let desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; + categories = [ "Network" "Development" "WebDevelopment" "Java" ]; desktopName = "Charles"; exec = "charles %F"; genericName = "Web Debugging Proxy"; icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + mimeTypes = [ + "application/x-charles-savedsession" + "application/x-charles-savedsession+xml" + "application/x-charles-savedsession+json" + "application/har+json" + "application/vnd.tcpdump.pcap" + "application/x-charles-trace" + ]; name = "Charles"; - startupNotify = "true"; + startupNotify = true; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix index 33f35ba12a..f7e7317131 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -38,7 +38,7 @@ let desktopName = "Cisco Packet Tracer 7"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer7 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix index c823dcbb1d..1267a06142 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -94,7 +94,7 @@ let desktopName = "Cisco Packet Tracer 8"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer8 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix new file mode 100644 index 0000000000..8127904023 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, lib, fetchFromGitHub }: + +buildGoModule rec { + pname = "argo-rollouts"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo-rollouts"; + rev = "v${version}"; + sha256 = "0qb1wbv3razwhqsv972ywfazaq73y83iw6f6qdjcbwwfwsybig21"; + }; + + vendorSha256 = "00ic1nn3wgg495x2170ik1d1cha20b4w89j9jclq8p0b3nndv0c0"; + + # Disable tests since some test fail because of missing test data + doCheck = false; + + subPackages = [ "cmd/rollouts-controller" "cmd/kubectl-argo-rollouts" ]; + + meta = with lib; { + description = "Kubernetes Progressive Delivery Controller"; + homepage = "https://github.com/argoproj/argo-rollouts/"; + license = licenses.asl20; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 52bd37ec61..976ef396ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -1,11 +1,11 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }: let # Argo can package a static server in the CLI using the `staticfiles` go module. # We build the CLI without the static server for simplicity, but the tool is still required for # compilation to succeed. # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = buildGoPackage rec { + staticfiles = pkgsBuildBuild.buildGoPackage rec { name = "staticfiles"; src = fetchFromGitHub { owner = "bouk"; @@ -54,7 +54,10 @@ buildGoModule rec { postInstall = '' for shell in bash zsh; do - $out/bin/argo completion $shell > argo.$shell + ${if (stdenv.buildPlatform == stdenv.hostPlatform) + then "$out/bin/argo" + else "${pkgsBuildBuild.argo}/bin/argo" + } completion $shell > argo.$shell installShellCompletion argo.$shell done ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index a629de6372..beedc41fa8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.16"; + version = "6.4.17"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA="; + sha256 = "sha256-oVL7tBtdFJt6ktctSZiNZMd6g1LEWQ/Hra4rcGM6BnQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 91d8655fe6..cf1ada4718 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nE2mrFALJCGxUce8anJ3ErUO8575GgR6pupG06rRCCM="; + sha256 = "sha256-1/WXpXZ6f4p4IZ/yropCjH3hHt+t5HGw0aq0HFk04mo="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 14e7095c4b..73888f41f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck="; + sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE="; }; vendorSha256 = null; 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 30a12281c8..a583bf3089 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.26.3"; - sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff"; - manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q"; + version = "0.27.3"; + sha256 = "08ax1033456hfm5qz0r671xm5ig0047nqp7xffyn9za498bm4i5q"; + manifestsSha256 = "165kspq10nvlihcb1460qmbw5r1mlzs5gliw01qa4mymvzmlggk7"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY="; + vendorSha256 = "sha256-ENSfec7iSKOkILgVCVnORpAia4D+vBjQAUXDA7EIvVQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix index e86eeb94ff..9c929ba260 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-zynhDxhZEpLmO8Z8shU8DnJUJ+K0wmf8fkRjMMV35uE="; + sha256 = "sha256-4gHwf8zOkCKbOPU4Zq1u4h5vn0r1Vi/B++ERxvr/iuk="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 49a53e84e2..a9b4441e00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.10.8"; + version = "1.10.10"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - sha256 = "sha256-D6UWwR+cs/pGLBOIky34g253xMxWygczbmjtg8ixNoQ="; + hash = "sha256-Be0ejIQ3euKXX6wc1abXz8BphhrDnBMP0GzmnrF7C/4="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-6hmGtTNuuR4V0uMGEsOy6Iz/hhL8p1cn/4rEx4Uleug="; + vendorSha256 = "1s3s4n2wgi4azwkmg9zw2a3gz378nb1i41p3s8aixfbf6fsqc6ga"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 0e8e652fbb..6a48cc8ada 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,23 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook -, jdk8_headless, jdk11_headless -, bash, coreutils, which -, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk8_headless +, jdk11_headless +, bash +, coreutils +, which +, bzip2 +, cyrus_sasl +, protobuf3_7 +, snappy +, zlib +, zstd , openssl }: with lib; +assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + let - common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }: + common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "" }: stdenv.mkDerivation rec { inherit pname version jdk libPatches untarDir openssl; src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz"; - inherit sha256; + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + sha256 = sha256.${stdenv.system}; }; + doCheck = true; nativeBuildInputs = [ makeWrapper ] - ++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ]; + ++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; buildInputs = [ openssl ] ++ nativeLibs; installPhase = '' @@ -51,46 +66,49 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ volth illustris ]; - platforms = [ "x86_64-linux" ]; + platforms = attrNames sha256; }; - }; in { # Different version of hadoop support different java runtime versions # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions - hadoop_3_3 = common rec { - pname = "hadoop"; - version = "3.3.1"; - sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; - untarDir = "${pname}-${version}"; - jdk = jdk11_headless; - inherit openssl; - # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ]; - libPatches = '' - ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 - ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ - patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 - ''; - }; + hadoop_3_3 = + common + (rec { + pname = "hadoop"; + version = "3.3.1"; + untarDir = "${pname}-${version}"; + sha256 = rec { + x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; + x86_64-darwin = x86_64-linux; + aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz"; + aarch64-darwin = aarch64-linux; + }; + + inherit openssl; + nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ]; + libPatches = '' + ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 + ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ + ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ + ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ + ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ + '' + optionalString stdenv.isLinux "patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0"; + jdk = jdk11_headless; + }); hadoop_3_2 = common rec { pname = "hadoop"; version = "3.2.2"; - sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; + sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden - openssl = null; }; hadoop2 = common rec { pname = "hadoop"; version = "2.10.1"; - sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; + sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; jdk = jdk8_headless; - openssl = null; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 3d36a32101..db9028d0af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-f0e2jdiIMfakG97LqJCP5Jk41D93a6wxaChN7WwY5oA="; + sha256 = "sha256-lFuDFuzart7uvs6NGNvNYh7JRF5ROx0V8uYoThF2mIU="; }; - vendorSha256 = "sha256-gukwJp+qLbNJlBL5SemrVD6mExPnX0+19tbw/b4SJ8s="; + vendorSha256 = "sha256-cVbQUWgreVy5m6OdS+Ik/xvUuedlI75gM9zq4qto+gY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 5b5dfece1f..3beb8e9c23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -49,6 +49,9 @@ let k3sVersion = "1.23.3+k3s1"; # k3s git tag k3sCommit = "6f4217a3405d16a1a51bbb40872d7dcb87207bb9"; # k3s git commit at the above version k3sRepoSha256 = "sha256-0dRusG1vL+1KbmViIUNCZK1b+FEgV6otcVUyFonHmm4="; + k3sVendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA="; + + k3sServerVendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. @@ -65,17 +68,17 @@ let # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - containerdVersion = "v1.5.9-k3s1"; + containerdVersion = "1.5.9-k3s1"; containerdSha256 = "sha256-7xlhBA6KuwFlw+jyThygv4Ow9F3xjjIUtS6x8YHwjic="; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - criCtlVersion = "v1.22.0-k3s1"; + criCtlVersion = "1.22.0-k3s1"; baseMeta = { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj ]; platforms = platforms.linux; }; @@ -91,10 +94,8 @@ let "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" "-X k8s.io/component-base/version.gitTreeState=clean" "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" - "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=${criCtlVersion}" - "-X github.com/containerd/containerd/version.Version=${containerdVersion}" - "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" - "-X github.com/containerd/containerd/version.Version=${containerdVersion}" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" ]; @@ -168,12 +169,13 @@ let # strip/patchelf/remove-references step ourselves in the installPhase of the # derivation when we've built all the binaries, but haven't bundled them in # with generated bindata yet. + k3sServer = buildGoModule rec { pname = "k3s-server"; version = k3sVersion; src = k3sRepo; - vendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0="; + vendorSha256 = k3sServerVendorSha256; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; @@ -203,11 +205,11 @@ let }; k3sContainerd = buildGoModule { pname = "k3s-containerd"; - version = k3sVersion; + version = containerdVersion; src = fetchFromGitHub { owner = "k3s-io"; repo = "containerd"; - rev = containerdVersion; + rev = "v${containerdVersion}"; sha256 = containerdSha256; }; vendorSha256 = null; @@ -222,7 +224,7 @@ buildGoModule rec { src = k3sRepo; proxyVendor = true; - vendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA="; + vendorSha256 = k3sVendorSha256; patches = [ ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh index 01b3434b5b..eb79778c96 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh @@ -1,12 +1,14 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq +#!nix-shell -i bash -p curl gnugrep gnused jq yq-go nix-prefetch set -x -eu -o pipefail WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT -cd $(dirname "${BASH_SOURCE[0]}") +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ +NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/ +cd ${NIXPKGS_K3S_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ @@ -32,22 +34,33 @@ curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK -TRAEFIK_CHART_VERSION=$(awk -F/ '/traefik-([[:digit:]]+\.)/ {sub(/traefik-/, "", $6) ; sub(/\.tgz/, "", $6); print $6}' $FILE_MANIFESTS_TRAEFIK) +FILE_GO_MOD=${WORKDIR}/go.mod +curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD +TRAEFIK_CHART_VERSION=$(yq e '.spec.chart' $FILE_MANIFESTS_TRAEFIK | awk 'match($0, /([0-9.]+)([0-9]{2})/, +m) { print m[1]; exit; }') TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz") -K3S_ROOT_VERSION=$(grep 'ROOT_VERSION=' ${FILE_SCRIPTS_DOWNLOAD} \ - | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//') +K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ - | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//') + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") +CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ + | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') +CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") + +CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ + | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') + setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix } setKV k3sVersion ${K3S_VERSION} @@ -62,3 +75,32 @@ setKV k3sRootSha256 ${K3S_ROOT_SHA256} setKV k3sCNIVersion ${CNIPLUGINS_VERSION} setKV k3sCNISha256 ${CNIPLUGINS_SHA256} + +setKV containerdVersion ${CONTAINERD_VERSION} +setKV containerdSha256 ${CONTAINERD_SHA256} + +setKV criCtlVersion ${CRI_CTL_VERSION} + +setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000" + +set +e +K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then + setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256} +else + echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty." + exit 1 +fi + +set +e +K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") +set -e + +if [ -n "${K3S_VENDOR_SHA256:-}" ]; then + setKV k3sVendorSha256 ${K3S_VENDOR_SHA256} +else + echo "Update failed. K3S_VENDOR_SHA256 is empty." + exit 1 +fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index b7a7ab3c5d..d4a02b6ab9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_22 = mkKops rec { - version = "1.22.2"; - sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8="; + version = "1.22.4"; + sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; rev = "v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix index 29a8388bd5..07d15feddd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03eGWuDV/GS2YgDQ7LaqonU7K/ohI8sQD4dXbJGXeXw="; + sha256 = "sha256-hKsGti04pUZj02uzah7ccImmg/qn31ceVfk11aTa9rk="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 7a708c5e06..8d11bc2801 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , fetchFromGitHub -, removeReferencesTo , which , go , makeWrapper , rsync , installShellFiles +, kubectl , nixosTests , components ? [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; }; - nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; + nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; @@ -51,12 +51,10 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" - "cmd/kubectl" ] ++ components); postBuild = '' ./hack/update-generated-docs.sh - (cd build/pause/linux && cc pause.c -o pause) ''; installPhase = '' @@ -65,9 +63,14 @@ stdenv.mkDerivation rec { install -D _output/local/go/bin/''${p##*/} -t $out/bin done - install -D build/pause/linux/pause -t $pause/bin + cc build/pause/linux/pause.c -o pause + install -D pause -t $pause/bin + + rm docs/man/man1/kubectl* installManPage docs/man/man1/*.[1-9] + ln -s ${kubectl}/bin/kubectl $out/bin/kubectl + # Unfortunately, kube-addons-main.sh only looks for the lib file in either the # current working dir or in /opt. We have to patch this for now. substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \ @@ -79,24 +82,22 @@ stdenv.mkDerivation rec { cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh - for tool in kubeadm kubectl; do - installShellCompletion --cmd $tool \ - --bash <($out/bin/$tool completion bash) \ - --zsh <($out/bin/$tool completion zsh) - done + installShellCompletion --cmd kubeadm \ + --bash <($out/bin/kubeadm completion bash) \ + --zsh <($out/bin/kubeadm completion zsh) runHook postInstall ''; - preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; + disallowedReferences = [ go ]; + + GOFLAGS = [ "-trimpath" ]; meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; maintainers = with maintainers; [ ] ++ teams.kubernetes.members; - platforms = platforms.unix; + platforms = platforms.linux; }; passthru.tests = nixosTests.kubernetes; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index fec93d8878..b1c1545854 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,29 +1,37 @@ -{ stdenv, kubernetes, installShellFiles }: +{ lib, stdenv, kubernetes }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "kubectl"; - version = kubernetes.version; - # kubectl is currently part of the main distribution but will eventially be - # split out (see homepage) - dontUnpack = true; - - nativeBuildInputs = [ installShellFiles ]; + inherit (kubernetes) + disallowedReferences + GOFLAGS + nativeBuildInputs + postBuild + postPatch + src + version + ; outputs = [ "out" "man" ]; - installPhase = '' - install -D ${kubernetes}/bin/kubectl -t $out/bin + WHAT = "cmd/kubectl"; - installManPage "${kubernetes.man}/share/man/man1"/kubectl* + installPhase = '' + runHook preInstall + install -D _output/local/go/bin/kubectl -t $out/bin + + installManPage docs/man/man1/kubectl* installShellCompletion --cmd kubectl \ --bash <($out/bin/kubectl completion bash) \ --zsh <($out/bin/kubectl completion zsh) + runHook postInstall ''; meta = kubernetes.meta // { description = "Kubernetes CLI"; homepage = "https://github.com/kubernetes/kubectl"; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 9b40f636bc..d4a9ba4af7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.25.1"; + version = "1.25.2"; - vendorSha256 = "sha256-MnyXePsnhb1Tl76uAtVW/DLacE0etXREGsapgNiZbMo="; + vendorSha256 = "sha256-8QqRIWry15/xwBxEOexMEq57ol8riy+kW8WrQqr53Q8="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-pRNOVN9u27im9fkUawJYjuGHTW0N7L5oJa3fQ6DUO+4="; + sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index 047a472c39..1f08aad53e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -18,6 +18,8 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; + postPatch = '' substituteInPlace nixops/args.py --subst-var version ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 5a121cbd3e..b5c9820bb3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "0c989d79c9052ebf52f12964131f4fc31ac20a18"; - sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1"; + rev = "d939c9bcae184d10583bf48211739b5b6521fc64"; + sha256 = "111wfph4c737xxs717pz8bnksp8zw0b6zv1il4zzq3fshv2ckd5c"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "83900880a413218020ddd91d6cd3f5b823acb3fb"; - sha256 = "17gf4vfcl1vx81y9vk26zzcj6kac41kfhzwcx15cj91ivqrgn3b2"; + rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8"; + sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9"; }; } ); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock index e0118fe792..d42776a82e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.20.20" +version = "1.21.11" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.23.20,<1.24.0" +botocore = ">=1.24.11,<1.25.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.23.20" +version = "1.24.11" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.9" +version = "2.0.12" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -181,7 +181,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "jsonpickle" -version = "2.0.0" +version = "2.1.0" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false @@ -189,7 +189,7 @@ python-versions = ">=2.7" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "enum34", "jsonlib"] "testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] [[package]] @@ -202,11 +202,11 @@ python-versions = "*" [[package]] name = "markupsafe" -version = "2.0.1" +version = "2.1.0" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "nixops" @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18" +resolved_reference = "d939c9bcae184d10583bf48211739b5b6521fc64" [[package]] name = "nixops-aws" @@ -249,7 +249,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "83900880a413218020ddd91d6cd3f5b823acb3fb" +resolved_reference = "bc9de10b77aa74c9b245fd533f829e4307b984e8" [[package]] name = "nixops-digitalocean" @@ -443,7 +443,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pygments" -version = "2.10.0" +version = "2.11.2" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -451,7 +451,7 @@ python-versions = ">=3.5" [[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -493,7 +493,7 @@ python-versions = "*" [[package]] name = "requests" -version = "2.26.0" +version = "2.27.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -511,7 +511,7 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.5.0" +version = "0.5.2" description = "An Amazon S3 Transfer Manager" category = "main" optional = false @@ -643,7 +643,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.13.2" +version = "2.13.3" description = "Run-time type checker for Python" category = "main" optional = false @@ -663,7 +663,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.7" +version = "1.26.8" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"}, - {file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"}, + {file = "boto3-1.21.11-py3-none-any.whl", hash = "sha256:bf5f6a8997ed11a66280ace67cc25ec31c28525940da91d309c3976a9955d4cf"}, + {file = "boto3-1.21.11.tar.gz", hash = "sha256:f2cecf5d176f398a39bfde0008df83c03f2142b2be5eabe32bf104961df68810"}, ] botocore = [ - {file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"}, - {file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"}, + {file = "botocore-1.24.11-py3-none-any.whl", hash = "sha256:b29c2b5906d7f70782634bb8713c77e39f23aafc994bb2f7dccbeb2b36712adc"}, + {file = "botocore-1.24.11.tar.gz", hash = "sha256:2af93de704f3122878a3233e7cf5de0b02f6c4c9fa993ca853b583f597bb1c38"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -761,8 +761,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, - {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, + {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, + {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -775,8 +775,6 @@ cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, - {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, - {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, @@ -813,82 +811,53 @@ jmespath = [ {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] jsonpickle = [ - {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, - {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, + {file = "jsonpickle-2.1.0-py2.py3-none-any.whl", hash = "sha256:1dee77ddc5d652dfdabc33d33cff9d7e131d428007007da4fd6f7071ae774b0f"}, + {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, ] libvirt-python = [ {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, ] markupsafe = [ - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, - {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win32.whl", hash = "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win32.whl", hash = "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win32.whl", hash = "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win32.whl", hash = "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7"}, + {file = "MarkupSafe-2.1.0.tar.gz", hash = "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f"}, ] nixops = [] nixops-aws = [] @@ -918,12 +887,12 @@ pycparser = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pygments = [ - {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, - {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, + {file = "Pygments-2.11.2-py3-none-any.whl", hash = "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65"}, + {file = "Pygments-2.11.2.tar.gz", hash = "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"}, ] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, @@ -938,12 +907,12 @@ pytz = [ {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, + {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, + {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, ] s3transfer = [ - {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, - {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, + {file = "s3transfer-0.5.2-py3-none-any.whl", hash = "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971"}, + {file = "s3transfer-0.5.2.tar.gz", hash = "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -982,8 +951,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"}, - {file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"}, + {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, + {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -991,6 +960,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, + {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, + {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 4bdaf76908..6329ff9ed1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -3,7 +3,7 @@ let package = buildGoModule rec { pname = "nomad-autoscaler"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" @@ -25,10 +25,10 @@ let owner = "hashicorp"; repo = "nomad-autoscaler"; rev = "v${version}"; - sha256 = "sha256-2d36ddAjbt+nPmsHawgMq1CnKB2VNv8yMKMrPx5L+yw="; + sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc="; }; - vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; + vendorSha256 = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index 7c97b9eaed..70c2557907 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.25.0"; + version = "0.25.1"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-woBmYDOOh3AQH0RZJtMCrOfjFBrpMPzv22cVZ2/xHZo="; - aarch64-linux = "sha256-3YUUdOZULjJZqVJP0aO/d1WulXlpwf012NYJ6Mc2qp8="; - x86_64-darwin = "sha256-9lbMyEid4I1fRLkLwGbmrB2OkycnGBPUU5wEdVZoTLo="; - aarch64-darwin = "sha256-Q0ZkQX9FpzEc6WC3mRoYfg9oW3fvLB1/Ksa64TDlSgo="; + x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; + aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; + x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; + aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix new file mode 100644 index 0000000000..be85981f7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, odo }: + +buildGoModule rec { + pname = "odo"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "redhat-developer"; + repo = "odo"; + rev = "v${version}"; + sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY="; + }; + + vendorSha256 = null; + + buildPhase = '' + make bin + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a odo $out/bin + ''; + + passthru.tests.version = testVersion { + package = odo; + command = "odo version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Developer-focused CLI for OpenShift and Kubernetes"; + license = licenses.asl20; + homepage = "odo.dev"; + maintainers = with maintainers; [ stehessel ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index a1d4b14683..dd542f9ffa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,9 +33,16 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ libkrb5 ncurses ]; + buildInputs = [ libkrb5 ]; - nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; + nativeBuildInputs = [ + clang + go-bindata + installShellFiles + ncurses + rsync + which + ]; patchPhase = '' patchShebangs ./hack diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index b8c8b4f784..cb0e9adaf2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "eedd1ecb188a49d4417bea96d1837f747647e7a4"; +let rev = "6cf7519717a14c9a3e495fcd4588fa4eb16d2be2"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.1"; # Do not forget to update `rev` above + version = "0.56.2"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,7 +20,7 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-J9hF7MfMYNB+d4V8hZWqwdUqYhoam9pQRSa+lGXulYQ="; + sha256 = "sha256-KYpBubNHAstKUtf9Ys4VCWyZ+y4HjzVMs9EtWzVFviQ="; }; vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc="; 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 d74ddedb31..7f80069997 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 @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.157.0", - "sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1", - "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.157.0" + "rev": "v1.158.0", + "sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr", + "vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0", + "version": "1.158.0" }, "ansible": { "owner": "nbering", @@ -94,10 +94,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.2.0", - "sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f", - "vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb", - "version": "4.2.0" + "rev": "v4.3.0", + "sha256": "05rxs09kqpiqhvphcwx7bw22sawsfcmlbhwyi7ss2pdbb9yhpz3s", + "vendorSha256": "0wh7rywm1y21ah1y52d4kykvf2zqa95qzs59r9skm3af8dsvfjgn", + "version": "4.3.0" }, "azuread": { "owner": "hashicorp", @@ -112,10 +112,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.97.0", - "sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg", + "rev": "v2.98.0", + "sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6", "vendorSha256": null, - "version": "2.97.0" + "version": "2.98.0" }, "azurestack": { "owner": "hashicorp", @@ -157,10 +157,10 @@ "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.1.1", - "sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm", - "vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k", - "version": "2.1.1" + "rev": "v2.2.0", + "sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n", + "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", + "version": "2.2.0" }, "checkly": { "owner": "checkly", @@ -176,10 +176,10 @@ "owner": "CheckPointSW", "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint", "repo": "terraform-provider-checkpoint", - "rev": "v1.6.0", - "sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf", - "vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7", - "version": "1.6.0" + "rev": "v1.7.0", + "sha256": "1msd3qjrrhl0v3m7n9ybkwxki5wpchzjswd2dcifbif4k8pcs470", + "vendorSha256": "0yaxgyzwja5dl4p7w8q77ash75xwsf05kq88nvmdf94lvspfnwlq", + "version": "1.7.0" }, "ciscoasa": { "owner": "CiscoDevNet", @@ -230,10 +230,10 @@ "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.3.11", - "sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c", + "rev": "v0.4.0", + "sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw", "vendorSha256": null, - "version": "0.3.11" + "version": "0.4.0" }, "consul": { "owner": "hashicorp", @@ -248,10 +248,10 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.9.2", - "sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc", + "rev": "v0.10.0", + "sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z", "vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk", - "version": "0.9.2" + "version": "0.10.0" }, "datadog": { "owner": "DataDog", @@ -356,10 +356,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.0.0", - "sha256": "0rpggjsnxwz3rd93nxqr0w2addscxw498mf1mjp3mvkj1f3r9afi", + "rev": "v1.1.0", + "sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf", "vendorSha256": null, - "version": "1.0.0" + "version": "1.1.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -401,10 +401,10 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.9.1", - "sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca", - "vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87", - "version": "3.9.1" + "rev": "v3.10.0", + "sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql", + "vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj", + "version": "3.10.0" }, "google": { "owner": "hashicorp", @@ -430,10 +430,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.19.0", - "sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn", - "vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a", - "version": "1.19.0" + "rev": "v1.20.1", + "sha256": "1hl1dplb59hssdlq0j83mix9abfgzkbpqpsfirwd8pv4z47s055j", + "vendorSha256": "157y4fwfd2l822ass7v2sa3vn3kxrfhiapg5rwsm8q3lg1g42f2m", + "version": "1.20.1" }, "gridscale": { "owner": "gridscale", @@ -448,10 +448,10 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.32.2", - "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "rev": "v1.33.1", + "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg", "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", - "version": "1.32.2" + "version": "1.33.1" }, "helm": { "owner": "hashicorp", @@ -466,10 +466,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.0.0", - "sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy", + "rev": "v5.0.1", + "sha256": "13nsqvcbb9ydzsgri090ddw2y5gcxa2a07i1hfzm78mf5hflp4rb", "vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy", - "version": "5.0.0" + "version": "5.0.1" }, "http": { "owner": "hashicorp", @@ -674,28 +674,28 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.2", - "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi", - "vendorSha256": null, - "version": "3.2.2" + "rev": "v3.3.0-alpha.1", + "sha256": "0lihzid312q8qh1bl9x1wqslshq7pb0q4m8dgbww1cszzg6xb5aq", + "vendorSha256": "0aniiiysh6iq20fcqvdgs6a4l3prbxzpqpp2ixpfaxhg4z5l8zrf", + "version": "3.3.0-alpha.1" }, "minio": { "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.3.0", - "sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000", - "vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b", - "version": "1.3.0" + "rev": "v1.4.0", + "sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z", + "vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac", + "version": "1.4.0" }, "mongodbatlas": { "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.2.0", - "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", - "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", - "version": "1.2.0" + "rev": "v1.3.0", + "sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn", + "vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz", + "version": "1.3.0" }, "ncloud": { "owner": "NaverCloudPlatform", @@ -774,10 +774,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.64.0", - "sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd", + "rev": "v4.65.0", + "sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq", "vendorSha256": null, - "version": "4.64.0" + "version": "4.65.0" }, "okta": { "owner": "okta", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.5", - "sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa", - "vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg", - "version": "1.27.5" + "rev": "v1.27.6", + "sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm", + "vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m", + "version": "1.27.6" }, "opsgenie": { "owner": "opsgenie", @@ -1045,10 +1045,10 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.12.0", - "sha256": "04rrs6x9grkqqqrz3l3nqzp3vy03jw24l1grx2nbw8srpgw1pcwl", + "rev": "v2.13.0", + "sha256": "1jg6jdmxi60v8gsqycnq7jy89l2zls37zvl317vhp8f93si2hr2d", "vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc", - "version": "2.12.0" + "version": "2.13.0" }, "template": { "owner": "hashicorp", @@ -1063,10 +1063,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.8", - "sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz", + "rev": "v1.61.13", + "sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s", "vendorSha256": null, - "version": "1.61.8" + "version": "1.61.13" }, "tfe": { "owner": "hashicorp", @@ -1136,10 +1136,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.3.0", - "sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk", + "rev": "v3.3.1", + "sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn", "vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x", - "version": "3.3.0" + "version": "3.3.1" }, "vcd": { "owner": "vmware", 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 3954a143e5..897acd7623 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.6"; - sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; - vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; + version = "1.1.7"; + sha256 = "sha256-E8qY17MSdA7fQW4wGSDiPzbndBP5SZwelAJAWzka/io="; + vendorSha256 = "sha256-lyy/hcr00ix6qZoxzSfCbXvDC8dRB2ZjrONywpqbVZ8="; 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 92810bcad4..110193a6ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aGVhxyPm5GtYjJlFNiPNxkPtdGdOiYOSkRRTlzyF/lM="; + sha256 = "sha256-Iv9ZQoU/mMYdxBuPfoYc/zQXQ14FmDBfoFwxnESC6Ns="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; 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 d373316b19..e0042e43ef 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.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-Jz3Tp5FqpmPuBscRB0KleQxtCvB43qmeLZNtGPnjuL0="; + sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40="; }; ldflags = [ @@ -18,9 +18,9 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" ]; - vendorSha256 = "sha256-fX9FeoIkxxSi3dl5W2MZLz5vN1VHkPNpTBGRxGP5Qx8="; + vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA="; - excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" "v1" "v1beta1" ]; + excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 4a78f01a1c..1287171917 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7"; + sha256 = "sha256-ek3WOL1sNPAIkZN/cWDSmlNtN41VL3SKb7Qb4kew8vo="; }; - vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb"; + vendorSha256 = "sha256-a0O36zyQQSVrGXWpTdCkAAwNAXU23pcFJBB+o2KYnWw="; nativeBuildInputs = [ go-bindata installShellFiles ]; 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 2769ec44ea..9c9cc56539 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.69"; + version = "1.2.72"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4="; + sha256 = "sha256-svnZBzFYKj9hIjv4SqPSP65rKIeWQqs2qwnx8J7dUIg="; }; - vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; + vendorSha256 = "sha256-75uCGxW6Gqfhk5oImz26fUR8BeGHkikXHGJcCH32MxQ="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix index 9c4340fffe..a65110b802 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -24,8 +24,8 @@ let comment = "Sync your files across computers and to the web"; desktopName = "Dropbox"; genericName = "File Synchronizer"; - categories = "Network;FileTransfer;"; - startupNotify = "false"; + categories = [ "Network" "FileTransfer" ]; + startupNotify = false; icon = "dropbox"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 6c3a9b7693..7f18fe2f51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -1,15 +1,18 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.18"; + version = "3.3.2"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; + hash = "sha256-Z2JYFnE9g2bWaR+Ghxg3zJUD0Ja8/od52jkOVWEqeVE="; }; postPatch = '' @@ -18,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + sed 's/[>=]=.*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 4c8f356cdf..c46c19896d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + sha256 = "0133dbzxy0n0i6bn2p3lx33kpabnf9kzs9mv4xws30hbns25q99k"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index fa795a11c2..9e245b46d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -103,11 +103,9 @@ in nodePackages.deltachat-desktop.override rec { desktopName = "Delta Chat"; genericName = "Delta Chat"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=DeltaChat - MimeType=x-scheme-handler/openpgp4fpr;x-scheme-handler/mailto; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "DeltaChat"; + mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ]; }); passthru.updateScript = ./update.sh; 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 4f19fd924e..d3416ef588 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,8 +3,8 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.17"; - ptb = "0.0.27"; - canary = "0.0.133"; + ptb = "0.0.29"; + canary = "0.0.134"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -26,12 +26,12 @@ let ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a"; + sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; }; }; 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 c9e642aceb..05833c1eea 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 @@ -100,8 +100,8 @@ stdenv.mkDerivation rec { icon = pname; inherit desktopName; genericName = meta.description; - categories = "Network;InstantMessaging;"; - mimeType = "x-scheme-handler/discord"; + categories = [ "Network" "InstantMessaging" ]; + mimeTypes = [ "x-scheme-handler/discord" ]; }; passthru.updateScript = writeScript "discord-update-script" '' 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 d968374066..2ad5d8c465 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 @@ -13,12 +13,15 @@ , AppKit , CoreServices , desktopToDarwinBundle +, useKeytar ? true }: let pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; + keytar = callPackage ./keytar { inherit Security AppKit; }; + seshat = callPackage ./seshat { inherit CoreServices; }; in mkYarnPackage rec { pname = "element-desktop"; @@ -39,8 +42,7 @@ mkYarnPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - seshat = callPackage ./seshat { inherit CoreServices; }; - keytar = callPackage ./keytar { inherit Security AppKit; }; + inherit seshat; buildPhase = '' runHook preBuild @@ -51,12 +53,14 @@ mkYarnPackage rec { node ./scripts/copy-res.js popd rm -rf node_modules/matrix-seshat node_modules/keytar - ln -s $keytar node_modules/keytar + ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"} ln -s $seshat node_modules/matrix-seshat runHook postBuild ''; installPhase = '' + runHook preInstall + # resources mkdir -p "$out/share/element" ln -s '${element-web}' "$out/share/element/webapp" @@ -83,6 +87,8 @@ mkYarnPackage rec { --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + + runHook postInstall ''; # Do not attempt generating a tarball for element-web again. @@ -100,14 +106,25 @@ mkYarnPackage rec { desktopName = "Element"; genericName = "Matrix Client"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=element - MimeType=x-scheme-handler/element; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "element"; + mimeTypes = [ "x-scheme-handler/element" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + + # TL;DR: keytar is optional while seshat isn't. + # + # This prevents building keytar when `useKeytar` is set to `false`, because + # if libsecret is unavailable (e.g. set to `null` or fails to build), then + # this package wouldn't even considered for building because + # "one of the dependencies failed to build", + # although the dependency wouldn't even be used. + # + # It needs to be `passthru` anyways because other packages do depend on it. + inherit keytar; + }; meta = with lib; { description = "A feature-rich client for Matrix.org"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index ae9627afe3..292b0dfa07 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { }; buildPhase = '' + runHook preBuild cp ${./yarn.lock} ./yarn.lock chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -37,16 +38,19 @@ in stdenv.mkDerivation rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/node-gyp rebuild + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf node_modules rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node + runHook postInstall ''; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index de38c7a90b..5017f85311 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -27,6 +27,7 @@ in rustPlatform.buildRustPackage rec { }; buildPhase = '' + runHook preBuild cd .. chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -36,16 +37,18 @@ in rustPlatform.buildRustPackage rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/neon build --release + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf native/!(index.node) - rm -rf node_modules - rm -rf $HOME + rm -rf node_modules $HOME cp -r . $out + runHook postInstall ''; cargoSha256 = pinData.cargoHash; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index e567f18fe7..99aef1526d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -2,13 +2,15 @@ , fetchFromGitLab , flutter , olm +, imagemagick +, makeDesktopItem }: flutter.mkFlutterApp rec { pname = "fluffychat"; version = "1.2.0"; - vendorHash = "sha256-Qg0IlajbIl8e3BkKgn4O+mbZGvhfqr7XwllBLJQAA/I="; + vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0="; src = fetchFromGitLab { owner = "famedly"; @@ -17,10 +19,58 @@ flutter.mkFlutterApp rec { hash = "sha256-PJH3jMQc6u9R6Snn+9rNN8t+8kt6l3Xt7zKPbpqj13E="; }; + desktopItem = makeDesktopItem { + name = "Fluffychat"; + exec = "@out@/bin/fluffychat"; + icon = "fluffychat"; + desktopName = "Fluffychat"; + genericName = "Chat with your friends (matrix client)"; + categories = "Chat;Network;InstantMessaging;"; + }; + buildInputs = [ olm ]; + nativeBuildInputs = [ + imagemagick + ]; + + flutterExtraFetchCommands = '' + M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + sed -i $M/scripts/prepare.sh \ + -e "s|/usr/lib/x86_64-linux-gnu/libolm.so.3|/bin/sh|g" \ + -e "s|if which flutter >/dev/null; then|exit; if which flutter >/dev/null; then|g" + + pushd $M + bash scripts/prepare.sh + popd + ''; + + # replace olm dummy path + postConfigure = '' + M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so + ''; + + postInstall = '' + FAV=$out/app/data/flutter_assets/assets/favicon.png + ICO=$out/share/icons + + install -D $FAV $ICO/fluffychat.png + mkdir $out/share/applications + cp $desktopItem/share/applications/*.desktop $out/share/applications + + for s in 24 32 42 64 128 256 512; do + D=$ICO/hicolor/''${s}x''${s}/apps + mkdir -p $D + convert $FAV -resize ''${s}x''${s} $D/fluffychat.png + done + + substituteInPlace $out/share/applications/*.desktop \ + --subst-var out + ''; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix index 853043b97c..8ed85cba85 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { icon = pname; desktopName = "Gitter"; genericName = meta.description; - categories = "Network;InstantMessaging;"; + categories = [ "Network" "InstantMessaging" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5f2a094ca3..695089c23e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -40,10 +40,10 @@ buildGoModule rec { makeDesktopItem { name = "net.maunium.gomuks.desktop"; exec = "@out@/bin/gomuks"; - terminal = "true"; + terminal = true; desktopName = "Gomuks"; genericName = "Matrix client"; - categories = "Network;Chat"; + categories = [ "Network" "Chat" ]; comment = meta.description; } }/* $out/ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix index e2ace1a5d3..21c28c7391 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Chat"; + categories = [ "Chat" ]; }; libPath = lib.makeLibraryPath ([ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index c20ec46f26..ffc2eea5b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -49,9 +49,9 @@ let desktopName = "mikutter"; exec = "mikutter"; icon = "mikutter"; - categories = "Network;"; + categories = [ "Network" ]; comment = description; - extraDesktopEntries.Keywords = "Mastodon;"; + keywords = [ "Mastodon" ]; }; mkInfoPlist = { version }: diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index c8f24e72a9..ce4963df01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -16,6 +16,6 @@ buildGoModule { description = "A file system based matrix client"; homepage = "https://git.lost.host/meutraa/mm"; license = licenses.isc; - maintainers = with maintainers; [ meutraa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index df038611c3..d4329ed09d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -10,8 +10,7 @@ let name = pname; exec = pname; icon = pname; - type = "Application"; - categories = "Network;"; + categories = [ "Network" ]; }); appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 0aa2d4cc67..f612ec524a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { desktopName = "Ricochet"; genericName = "Ricochet"; comment = meta.description; - categories = "Office;Email;"; + categories = [ "Office" "Email" ]; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json index aceeec448f..d227dc4b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,9 @@ { - "version": "1.9.8-sc.1", - "srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni", - "webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l", - "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18" + "version": "1.10.4-sc.1", + "rev": "v1.10.4-sc.1", + "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", + "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", + "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", + "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", + "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index f16c7b599e..a87d57ecc9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; @@ -108,11 +108,9 @@ stdenv.mkDerivation rec { desktopName = "SchildiChat"; genericName = "Matrix Client"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=schildichat - MimeType=x-scheme-handler/element; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "schildichat"; + mimeTypes = [ "x-scheme-handler/element" ]; }) ]; @@ -122,7 +120,7 @@ stdenv.mkDerivation rec { description = "Matrix client / Element Desktop fork"; homepage = "https://schildi.chat/"; changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = lib.teams.matrix.members; + maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index c1bfc98047..f9e00c0647 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -20,15 +20,23 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; - offlineCache = fetchYarnDeps { + webOfflineCache = fetchYarnDeps { yarnLock = src + "/element-web/yarn.lock"; sha256 = pinData.webYarnHash; }; + jsSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-js-sdk/yarn.lock"; + sha256 = pinData.jsSdkYarnHash; + }; + reactSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-react-sdk/yarn.lock"; + sha256 = pinData.reactSdkYarnHash; + }; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; @@ -37,14 +45,30 @@ in stdenv.mkDerivation rec { export HOME=$PWD/tmp mkdir -p $HOME + pushd element-web - yarn config --offline set yarn-offline-mirror $offlineCache fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $webOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules rm -rf node_modules/matrix-react-sdk - patchShebangs node_modules/ ../matrix-react-sdk/scripts/ ln -s $PWD/../matrix-react-sdk node_modules/ - ln -s $PWD/node_modules ../matrix-react-sdk/ + rm -rf node_modules/matrix-js-sdk + ln -s $PWD/../matrix-js-sdk node_modules/ + popd + + pushd matrix-js-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + popd + + pushd matrix-react-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules scripts popd runHook postConfigure @@ -54,7 +78,7 @@ in stdenv.mkDerivation rec { runHook preBuild pushd matrix-react-sdk - node_modules/.bin/reskindex -h ../element-web/src/header + ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header popd pushd element-web @@ -79,7 +103,7 @@ in stdenv.mkDerivation rec { description = "Matrix client / Element Web fork"; homepage = "https://schildi.chat/"; changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = lib.teams.matrix.members; + maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 3f5289de8c..6ddc99902c 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -1,35 +1,43 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq -if [[ "$#" -gt 1 || "$1" == -* ]]; then +if [[ "$#" -gt 2 || "$1" == -* ]]; then echo "Regenerates packaging data for the SchildiChat packages." - echo "Usage: $0 [git release tag]" + echo "Usage: $0 [git revision or tag] [version string override]" exit 1 fi -version="$1" +rev="$1" +version="$2" set -euo pipefail -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" +if [ -z "$rev" ]; then + rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi -# strip leading "v" -version="${version#v}" +if [ -z "$version" ]; then + # strip leading "v" + version="${rev#v}" +fi -src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version}) +src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev) src=$(echo $src_data | jq -r .path) src_hash=$(echo $src_data | jq -r .sha256) web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) +js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) +react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) cat > pin.json << EOF { "version": "$version", + "rev": "$rev", "srcHash": "$src_hash", "webYarnHash": "$web_yarn_hash", + "jsSdkYarnHash": "$js_sdk_yarn_hash", + "reactSdkYarnHash": "$react_sdk_yarn_hash", "desktopYarnHash": "$desktop_yarn_hash" } EOF 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 8af5185386..6d1bb0af14 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 @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: -, systemd, libnotify, libdbusmenu, libpulseaudio +, systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.31.1"; # Please backport all updates to the stable channel. + version = "5.33.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-6w6znIIN5TFXTLLhazWyBXiqS5882zMNRZxYxnZjRHA="; + sha256 = "03c7pw6cmv8ryw2wqsfc27d953950jc8nxs58mgk08g62v4qa672"; }; nativeBuildInputs = [ @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { (lib.getLib systemd) libnotify libdbusmenu + xdg-utils ]; unpackPhase = "dpkg-deb -x $src ."; @@ -123,6 +124,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) # Fix the desktop link diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 931e9f93d0..4766b796a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220218"; + version = "20220303"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE="; + sha256 = "sha256-3fT9cHosg/A/JowIARQ46OxmsQWFOBb7tIiRWVNfUo4="; }; # Remove when Apple SDK is >= 10.13 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch new file mode 100644 index 0000000000..e23aded6d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -0,0 +1,35 @@ +From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:33:13 +0100 +Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD + +--- + build.gradle | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build.gradle b/build.gradle +index cbb587f..3b06e80 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -82,6 +82,9 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages ++ maven { ++ url "https://plugins.gradle.org/m2/" ++ } + mavenCentral() + } + +@@ -102,6 +105,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch new file mode 100644 index 0000000000..c5931238fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -0,0 +1,60 @@ +From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:36:15 +0100 +Subject: [PATCH 2/2] buildconfig/local deps fixes + +--- + build.gradle | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/build.gradle b/build.gradle +index cbb587f..ad836cf 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal + import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal + import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + ++buildscript { ++ repositories { ++ maven { ++ url(uri("@deps@")) ++ } ++ } ++ dependencies { ++ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" ++ } ++} ++ + plugins { +- id 'com.github.gmazzo.buildconfig' version '3.0.3' + id 'application' + } ++apply plugin: "com.github.gmazzo.buildconfig" + + compileJava.options.encoding = 'UTF-8' + +@@ -82,7 +93,10 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages +- mavenCentral() ++ mavenLocal() ++ maven { ++ url uri("@deps@") ++ } + } + + dependencies { +@@ -102,6 +116,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix index e75c2357b2..3f84c156f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,34 +1,24 @@ { lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl -, makeWrapper, fetchpatch +, makeWrapper, fetchpatch, substituteAll }: let pname = "signald"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg="; - }; - - log4j-update-cve-2021-44228 = fetchpatch { - url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch"; - sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM="; - }; - - buildConfigJar = fetchurl { - url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar"; - sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; + sha256 = "sha256-eN6lEs6PuRczbzQZmGlNf6Ahp4FbWpA3EArlATEiZHU="; }; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - patches = [ log4j-update-cve-2021-44228 ]; nativeBuildInputs = [ gradle_6 perl ]; + patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -36,7 +26,7 @@ let # 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' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ | sh ''; # Don't move info to share/ @@ -45,8 +35,8 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8="; - aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc="; + x86_64-linux = "sha256-kZ25p+lIkOqNoFFBgJRYFcvKJenKICVa1PasaaEHmRA="; + aarch64-linux = "sha256-CbFNigp3R7ETX0uXv6PNuhDpmPc4sowbWmwZ+5txXQs="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -54,22 +44,17 @@ in stdenv.mkDerivation rec { inherit pname src version; patches = [ - ./gradle-plugin.patch - log4j-update-cve-2021-44228 + (substituteAll { + src = ./0002-buildconfig-local-deps-fixes.patch; + inherit deps; + }) ]; - postPatch = '' - sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle - ''; - buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) - # Use the local packages from -deps - sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle - gradle --offline --no-daemon distTar runHook postBuild @@ -100,7 +85,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://signald.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ expipiplus1 ma27 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch deleted file mode 100644 index fec988a94e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 11d7a99..66805bb 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.xml.sax.SAXParseException - --plugins { -- id 'de.fuerstenau.buildconfig' version '1.1.8' -+buildscript { -+ dependencies { -+ classpath files ("BuildConfig.jar") -+ } - } -+apply plugin: 'de.fuerstenau.buildconfig' - - apply plugin: 'java' - apply plugin: 'application' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 4fc3d56bac..b23f4f107a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.80.0.143"; + version = "8.81.0.268"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY="; + sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 513f427ee1..80d04eabc8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395 ]; desktopItem = makeDesktopItem { @@ -23,7 +23,7 @@ let comment = "The TeamSpeak voice communication tool"; desktopName = "TeamSpeak"; genericName = "TeamSpeak"; - categories = "Network"; + categories = [ "Network" ]; }; fakeLess = writeShellScriptBin "less" "cat"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9a34513aca..265e72c386 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -70,7 +70,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.4.8"; + version = "3.5.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +79,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4"; + sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 25dc1ff3d0..a3c61a6f33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -4,17 +4,18 @@ , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire +, mesa, valgrind, libepoxy, libglvnd }: stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-12-22"; + version = "unstable-2022-02-09"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e"; - sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny"; + rev = "4cba1acdd718b700bb33945c0258283689d4eac7"; + sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca"; fetchSubmodules = true; }; @@ -27,6 +28,7 @@ stdenv.mkDerivation { openh264 usrsctp libevent libvpx libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + mesa libepoxy libglvnd ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index 943ec299cd..2d5f6e2dfb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -32,8 +32,8 @@ mkDerivation rec { comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = [ "Chat" "Utility" ]; + mimeTypes = [ "application/x-chat" ]; }; installPhase = if stdenv.isDarwin then '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 51b119aa6d..5fb0f14f36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,20 +4,20 @@ let pname = "vk-messenger"; - version = "5.2.3"; + version = "5.3.2"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19"; + sha256 = "L0nE0zW4LP8udcE8uPy+cH9lLuQsUSq7cF13Gv7w2rI="; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb"; + sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ="; }; x86_64-darwin = fetchurl { - url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg"; - sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b"; + url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg"; + sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 371ac91120..26a6b43d44 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -16,7 +16,7 @@ let icon = "wavebox"; desktopName = name; genericName = name; - categories = "Network;"; + categories = [ "Network" ]; }; tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index fc8fbdcede..974d9a6a05 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -68,16 +68,14 @@ let }; desktopItem = makeDesktopItem { - categories = "Network;InstantMessaging;Chat;VideoConference"; + categories = [ "Network" "InstantMessaging" "Chat" "VideoConference" ]; comment = "Secure messenger for everyone"; desktopName = "Wire"; exec = "wire-desktop %U"; genericName = "Secure messenger"; icon = "wire-desktop"; name = "wire-desktop"; - extraEntries = '' - StartupWMClass=Wire - ''; + startupWMClass = "Wire"; }; dontBuild = true; 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 a339808745..4aa9dbc9b1 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 @@ -28,11 +28,11 @@ }: let - version = "5.9.3.1911"; + version = "5.9.6.2225"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4"; + sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/all-migrations.nix new file mode 100644 index 0000000000..a376e9f895 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/all-migrations.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, symlinkJoin +, buildGoModule +, ipfs-migrator-unwrapped +}: + +# This package contains all the individual migrations in the bin directory. +# This is used by fs-repo-migrations and could also be used by IPFS itself +# when starting it like this: ipfs daemon --migrate + +let + fs-repo-common = pname: version: buildGoModule { + inherit pname version; + inherit (ipfs-migrator-unwrapped) src; + sourceRoot = "source/${pname}"; + vendorSha256 = null; + doCheck = false; + meta = ipfs-migrator-unwrapped.meta // { + mainProgram = pname; + description = "Individual migration for the filesystem repository of ipfs clients"; + }; + }; + + # Concatenation of the latest repo version and the version of that migration + version = "12.1.0.2"; + + fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; + fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; + fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; + fs-repo-8-to-9 = fs-repo-common "fs-repo-8-to-9" "1.0.1"; + fs-repo-7-to-8 = fs-repo-common "fs-repo-7-to-8" "1.0.1"; + fs-repo-6-to-7 = fs-repo-common "fs-repo-6-to-7" "1.0.1"; + fs-repo-5-to-6 = fs-repo-common "fs-repo-5-to-6" "1.0.1"; + fs-repo-4-to-5 = fs-repo-common "fs-repo-4-to-5" "1.0.1"; + fs-repo-3-to-4 = fs-repo-common "fs-repo-3-to-4" "1.0.1"; + fs-repo-2-to-3 = fs-repo-common "fs-repo-2-to-3" "1.0.1"; + fs-repo-1-to-2 = fs-repo-common "fs-repo-1-to-2" "1.0.1"; + fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; + + all-migrations = [ + fs-repo-11-to-12 + fs-repo-10-to-11 + fs-repo-9-to-10 + fs-repo-8-to-9 + fs-repo-7-to-8 + ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 + ++ [ + fs-repo-5-to-6 + fs-repo-4-to-5 + fs-repo-3-to-4 + fs-repo-2-to-3 + fs-repo-1-to-2 + fs-repo-0-to-1 + ]; + +in + +symlinkJoin { + name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + paths = all-migrations; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index abc81e213d..d8c5de150b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildEnv +, makeWrapper +, ipfs-migrator-unwrapped +, ipfs-migrator-all-fs-repo-migrations +}: -buildGoModule rec { - pname = "ipfs-migrator"; - version = "1.7.1"; +buildEnv { + name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "fs-repo-migrations"; - rev = "v${version}"; - sha256 = "sha256-MxEKmoveIpuxBkGGGJHp9T11i3Py8a1fLpF0fWk0ftg="; - }; + nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = null; + paths = [ ipfs-migrator-unwrapped ]; - doCheck = false; + pathsToLink = [ "/bin" ]; - subPackages = [ "." ]; + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' + ''; - meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; - homepage = "https://ipfs.io/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ elitak ]; - }; + inherit (ipfs-migrator-unwrapped) meta; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/unwrapped.nix new file mode 100644 index 0000000000..c8ade79321 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/unwrapped.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ipfs-migrator"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "fs-repo-migrations"; + # Use the latest git tag here, since v2.0.2 does not + # contain the latest migration fs-repo-11-to-12/v1.0.2 + # The fs-repo-migrations code itself is the same between + # the two versions but the migration code, which is built + # into separate binaries, is not. + rev = "fs-repo-11-to-12/v1.0.2"; + sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; + }; + + sourceRoot = "source/fs-repo-migrations"; + + vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; + + doCheck = false; + + meta = with lib; { + description = "Migrations for the filesystem repository of ipfs clients"; + homepage = "https://github.com/ipfs/fs-repo-migrations"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi elitak ]; + mainProgram = "fs-repo-migrations"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix index c0526fc0d9..2cceddf0bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,15 @@ buildGoModule rec { pname = "ipfs"; - version = "0.11.0"; + version = "0.12.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; + repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "lTPGnFqDgyMWmSCPmLHguGNnJQMWi9LPrOZfDgeS9Y4="; + sha256 = "jWoMm/xIp3Zn/FiHWQ5/q39i6Lh4Fdoi9OdnRVc51Xk="; }; # tarball contains multiple files/directories diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix index 9f97978185..d032238ca5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "2.0a"; + version = "2.1"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-AbzzTqaulPDplntwRYw4fVxZXUIJ2L0MKZvyWq4lvro="; + sha256 = "sha256-pov7gvYlvN97xbem4VKP41Wbze1B8NPJcvi36Ri87o4="; }; # catgirl's configure script uses pkg-config --variable exec_prefix openssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index 78876090e9..2f0f3bd74f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -6,16 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.5.2"; + version = "1.5.3"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-/wleUwTPkm5l8GgtBM2J0jsdc1A54WRYJPmHqSsdz4c="; + sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ="; }; + format = "pyproject"; + propagatedBuildInputs = with python3.pkgs; [ click markdown2 diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 246d666df3..4d4e33c637 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.3"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qgi2ycWlzY4PaiEMHu0Rd3bN2aqFcLtxkII1MzZXls4="; + sha256 = "gpIW4GBXT0GCtV7Q8EfdEeK56gCACi+PJ/jbwQkVQbk="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; - license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 + license = licenses.lgpl21Plus; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/0001-nulldb.patch b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/0001-nulldb.patch new file mode 100644 index 0000000000..61971525b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/0001-nulldb.patch @@ -0,0 +1,15 @@ +diff --git a/config/application.rb b/config/application.rb +index d85a17491..90ea5e387 100644 +--- a/config/application.rb ++++ b/config/application.rb +@@ -3,6 +3,7 @@ + require_relative 'boot' + + require 'rails/all' ++require 'nulldb' + require_relative 'issue_2656_workaround_for_rails_issue_33600' + + # DO NOT REMOVE THIS LINE - see issue #2037 +diff --git a/db/schema.rb b/db/schema.rb +new file mode 100644 +index 000000000..e69de29bb diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix new file mode 100644 index 0000000000..21c9b98a01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix @@ -0,0 +1,137 @@ +{ stdenv +, lib +, fetchFromGitHub +, applyPatches +, bundlerEnv +, defaultGemConfig +, callPackage +, writeText +, procps +, ruby_2_7 +, postgresql +, imlib2 +, nodejs +, yarn +, yarn2nix-moretea +, v8 +, cacert +}: + +let + pname = "zammad"; + version = "5.0.2"; + + src = applyPatches { + + src = fetchFromGitHub (lib.importJSON ./source.json); + + patches = [ ./0001-nulldb.patch ]; + + postPatch = '' + sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile + sed -i -e "s|ruby 2.7.4p191|ruby ${ruby_2_7.version}|" Gemfile.lock + sed -i -e "s|2.7.4|${ruby_2_7.version}|" .ruby-version + ''; + }; + + databaseConfig = writeText "database.yml" '' + production: + url: <%= ENV['DATABASE_URL'] %> + ''; + + secretsConfig = writeText "secrets.yml" '' + production: + secret_key_base: <%= ENV['SECRET_KEY_BASE'] %> + ''; + + rubyEnv = bundlerEnv { + name = "${pname}-gems-${version}"; + inherit version; + + # Which ruby version to select: + # https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language + inherit ruby_2_7; + + gemdir = src; + gemset = ./gemset.nix; + groups = [ + "assets" + "unicorn" # server + "nulldb" + "test" + "mysql" + "puma" + "development" + "postgres" # database + ]; + gemConfig = defaultGemConfig // { + pg = attrs: { + buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" ]; + }; + rszr = attrs: { + buildInputs = [ imlib2 imlib2.dev ]; + }; + mini_racer = attrs: { + buildFlags = [ + "--with-v8-dir=\"${v8}\"" + ]; + dontBuild = false; + postPatch = '' + substituteInPlace ext/mini_racer_extension/extconf.rb \ + --replace Libv8.configure_makefile '$CPPFLAGS += " -x c++"; Libv8.configure_makefile' + ''; + }; + }; + }; + + yarnEnv = yarn2nix-moretea.mkYarnPackage { + pname = "${pname}-node-modules"; + inherit version src; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + packageJSON = ./package.json; + }; + +in +stdenv.mkDerivation { + inherit pname version src; + + buildInputs = [ + rubyEnv + rubyEnv.wrappedRuby + rubyEnv.bundler + yarn + nodejs + procps + cacert + ]; + + RAILS_ENV = "production"; + + buildPhase = '' + node_modules=${yarnEnv}/libexec/Zammad/node_modules + ${yarn2nix-moretea.linkNodeModulesHook} + + rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile + ''; + + installPhase = '' + cp -R . $out + cp ${databaseConfig} $out/config/database.yml + cp ${secretsConfig} $out/config/secrets.yml + sed -i -e "s|info|debug|" $out/config/environments/production.rb + ''; + + passthru = { + inherit rubyEnv yarnEnv; + updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ]; + }; + + meta = with lib; { + description = "Zammad, a web-based, open source user support/ticketing solution."; + homepage = "https://zammad.org"; + license = licenses.agpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ n0emis garbas taeer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/gemset.nix new file mode 100644 index 0000000000..57a54ef483 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/gemset.nix @@ -0,0 +1,2834 @@ +{ + aasm = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05j0rdhdzc628v5nyzrazp4704hh96j5sjbn48zxyk4v3a61f4m2"; + type = "gem"; + }; + version = "5.2.0"; + }; + actioncable = { + dependencies = [ "actionpack" "nio4r" "websocket-driver" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vv8dq95apmwsnam1l2c62ayjr2jwi5m24bcd2l4p324cqmds3ir"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + actionmailbox = { + dependencies = [ "actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0q8bhmdi1jgybs18vaa3hpmydhw8mjx8hcpjlravkwc78ckl19vy"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + actionmailer = { + dependencies = [ "actionpack" "actionview" "activejob" "mail" "rails-dom-testing" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nximq0hwcy5vhywsryn6y67zaqwhk5gk44d0rgyisbwl6s34zim"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + actionpack = { + dependencies = [ "actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00vsfvrbw1dx1xpvpca5szk1z9qqv5g00c2gyrvskvxbgn3298bg"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + actiontext = { + dependencies = [ "actionpack" "activerecord" "activestorage" "activesupport" "nokogiri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00yz34p7syz3wr7sbgn81b5qf97hv5lm2vbbf5xiny9cj1y8hrll"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + actionview = { + dependencies = [ "activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03dqdl0qkwmkxf6xar9lrxp547hj72ysqg6i13kw8jg8mprk1xk1"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + activejob = { + dependencies = [ "activesupport" "globalid" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r4dk44x1kn16bsi4h9q13sq65waa940nrnf4i0wd2cssk34sx3i"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + activemodel = { + dependencies = [ "activesupport" ]; + groups = [ "default" "nulldb" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1m254z419v5n6flqvvf923p5hxwqv43x6nr8gzaw378vl68sp8ff"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + activerecord = { + dependencies = [ "activemodel" "activesupport" ]; + groups = [ "default" "nulldb" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q48dsxkvlrr34w6hap2dyr1ym68azkmnhllng60pxaizml89azl"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + activerecord-import = { + dependencies = [ "activerecord" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17ydad9gcsh0c9ny68fyvxmh6rbld4pyvyabnc7882678dnvfy8i"; + type = "gem"; + }; + version = "1.2.0"; + }; + activerecord-nulldb-adapter = { + dependencies = [ "activerecord" ]; + groups = [ "nulldb" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1iybn9vafw9vcdi966yidj4zk5vy6b0gg0zk39v1r0kgj9n9qm1v"; + type = "gem"; + }; + version = "0.7.0"; + }; + activerecord-session_store = { + dependencies = [ "actionpack" "activerecord" "multi_json" "rack" "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06ddhz1b2yg72iv09n48gcd3ix5da7hxlzi7vvj13nrps2qwlffg"; + type = "gem"; + }; + version = "2.0.0"; + }; + activestorage = { + dependencies = [ "actionpack" "activejob" "activerecord" "marcel" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1g6h5k478d9v14w09wnhflsk8xj06clkd6xbfw4sxbbww5n8vl55"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + activesupport = { + dependencies = [ "concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk" ]; + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ldrpgy4gfqykzavgdp0svsm41hkzfi2aaq8as9lqd0sq19mgpqx"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + acts_as_list = { + dependencies = [ "activerecord" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12p22h59c45dnccb51pqk275ziyi502azf9w3qcnkcsq827ma5jm"; + type = "gem"; + }; + version = "1.0.4"; + }; + addressable = { + dependencies = [ "public_suffix" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + argon2 = { + dependencies = [ "ffi" "ffi-compiler" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0285wr6ai2c1qswr67pybpbj28dv5nv1i4597hg3vg9w1fb7gmzl"; + type = "gem"; + }; + version = "2.0.3"; + }; + ast = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + async = { + dependencies = [ "console" "nio4r" "timers" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lh36bsb41vllyrkiffs8qba2ilcjl7nrywizrb8ffrix50rfjn9"; + type = "gem"; + }; + version = "1.29.1"; + }; + async-http = { + dependencies = [ "async" "async-io" "async-pool" "protocol-http" "protocol-http1" "protocol-http2" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a1si0iz1m6b1lzd5f8cvf1cbniy8kqc06n10bn74l1ppx8a6lc2"; + type = "gem"; + }; + version = "0.56.3"; + }; + async-http-faraday = { + dependencies = [ "async-http" "faraday" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ndynkfknabv6m9wzcmdnj4r4bhlxqkg9c6rzsjc1pk8q057kslv"; + type = "gem"; + }; + version = "0.11.0"; + }; + async-io = { + dependencies = [ "async" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1z58cgnw79idasx63knyjqihxp5v4wrp7r4jf251a8kyykwdd83a"; + type = "gem"; + }; + version = "1.32.1"; + }; + async-pool = { + dependencies = [ "async" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rq62gnhiy4a275wid465xqv6f6xsmp1zd9002xw4b37y83y5rqg"; + type = "gem"; + }; + version = "0.3.7"; + }; + autodiscover = { + dependencies = [ "httpclient" "logging" "nokogiri" "nori" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + fetchSubmodules = false; + rev = "ee9b53dfa797ce6d4f970b82beea7fbdd2df56bb"; + sha256 = "1qffylir5i06vd3khwd182pslnqsa0kfc3dihvvjfdyl7p1lxv16"; + type = "git"; + url = "https://github.com/zammad-deps/autodiscover"; + }; + version = "1.0.2"; + }; + autoprefixer-rails = { + dependencies = [ "execjs" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1bj8ajlq6ygyqxz7ykykaxfr4jn0ivc95sl64wrycwz7hxz29vda"; + type = "gem"; + }; + version = "10.3.3.0"; + }; + binding_of_caller = { + dependencies = [ "debug_inspector" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; + type = "gem"; + }; + version = "1.0.0"; + }; + biz = { + dependencies = [ "clavius" "tzinfo" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1n2d7cs9jlnpi75nbssv77qlw0jsqnixaikpxsrbxz154q43gvlc"; + type = "gem"; + }; + version = "1.8.2"; + }; + bootsnap = { + dependencies = [ "msgpack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ndjra3h86dq28njm2swmaw6n3vsywrycrf7i5iy9l8hrhfhv4x2"; + type = "gem"; + }; + version = "1.9.1"; + }; + brakeman = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0"; + type = "gem"; + }; + version = "5.1.1"; + }; + browser = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; + type = "gem"; + }; + version = "5.3.1"; + }; + buftok = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + type = "gem"; + }; + version = "0.2.0"; + }; + builder = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + byebug = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + capybara = { + dependencies = [ "addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1viqcpsngy9fqjd68932m43ad6xj656d1x33nx9565q57chgi29k"; + type = "gem"; + }; + version = "3.35.3"; + }; + childprocess = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + type = "gem"; + }; + version = "3.0.0"; + }; + chunky_png = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; + clavius = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y58v8k860vafm1psm69f2ndcqmcifyvswsjdy8bxbxy30zrgad1"; + type = "gem"; + }; + version = "1.0.4"; + }; + clearbit = { + dependencies = [ "nestful" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ccgvxzgpll1wr5i9wjm1h0m2z600j6c4yf6pww423qhg8a25lbl"; + type = "gem"; + }; + version = "0.3.3"; + }; + coderay = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + coffee-rails = { + dependencies = [ "coffee-script" "railties" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "170sp4y82bf6nsczkkkzypzv368sgjg6lfrkib4hfjgxa6xa3ajx"; + type = "gem"; + }; + version = "5.0.0"; + }; + coffee-script = { + dependencies = [ "coffee-script-source" "execjs" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; + type = "gem"; + }; + version = "1.12.2"; + }; + coffeelint = { + dependencies = [ "coffee-script" "execjs" "json" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k6nqia44m6jzzkav6wz1aafjipbygla3g6nl6i7sks854bwgdg1"; + type = "gem"; + }; + version = "1.16.1"; + }; + composite_primary_keys = { + dependencies = [ "activerecord" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08w8rns5dgjmvavqf1apfbd59dyqyv4igni940rklnqps297w2bn"; + type = "gem"; + }; + version = "12.0.10"; + }; + concurrent-ruby = { + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + console = { + dependencies = [ "fiber-local" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04vhg3vnj2ky00fld4v6qywx32z4pjsa7l8i7sl1bl213s8334l9"; + type = "gem"; + }; + version = "1.13.1"; + }; + coveralls = { + dependencies = [ "multi_json" "rest-client" "simplecov" "term-ansicolor" "thor" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b97bp3kndl1glfx8rlm19b1vxphirvkrjqn5hn9y1p975iwhl3w"; + type = "gem"; + }; + version = "0.7.1"; + }; + crack = { + dependencies = [ "rexml" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; + type = "gem"; + }; + version = "0.4.5"; + }; + crass = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + type = "gem"; + }; + version = "1.0.6"; + }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "079al4y5rjgx12s7rg08rnf9w1n51a7ghycvmr7vhw6r6i81ry8s"; + type = "gem"; + }; + version = "3.2.0"; + }; + daemons = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + dalli = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764"; + type = "gem"; + }; + version = "2.7.11"; + }; + debug_inspector = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; + delayed_job = { + dependencies = [ "activesupport" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19ym3jw2jj1pxm6p22x2mpf69sdxiw07ddr69v92ccgg6d7q87rh"; + type = "gem"; + }; + version = "4.1.9"; + }; + delayed_job_active_record = { + dependencies = [ "activerecord" "delayed_job" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n6wjvk0yfkp1z19kvma7piasw1xgjh5ls51sf24c8g1jlmkmvdh"; + type = "gem"; + }; + version = "4.1.6"; + }; + deprecation_toolkit = { + dependencies = [ "activesupport" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; + type = "gem"; + }; + version = "1.5.1"; + }; + diff-lcs = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; + type = "gem"; + }; + version = "1.4.4"; + }; + diffy = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; + type = "gem"; + }; + version = "3.4.0"; + }; + docile = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + type = "gem"; + }; + version = "1.4.0"; + }; + domain_name = { + dependencies = [ "unf" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + doorkeeper = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hnwd7by65yyiz90ycs3pj4f78s7bnl09nzs1g1vs62509j4nz19"; + type = "gem"; + }; + version = "5.5.2"; + }; + dotenv = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + eco = { + dependencies = [ "coffee-script" "eco-source" "execjs" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09jiwb7pkg0sxk730maxahra4whqw5l47zd7yg7fvd71pikdwdr0"; + type = "gem"; + }; + version = "1.0.0"; + }; + eco-source = { + groups = [ "assets" "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ccxrvaac6mw5kdj1i490b5xb1wdka3a5q4jhvn8dvg41594yba1"; + type = "gem"; + }; + version = "1.1.0.rc.1"; + }; + em-websocket = { + dependencies = [ "eventmachine" "http_parser.rb" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; + type = "gem"; + }; + version = "0.5.2"; + }; + equalizer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; + type = "gem"; + }; + version = "0.0.11"; + }; + erubi = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + type = "gem"; + }; + version = "1.10.0"; + }; + eventmachine = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + execjs = { + groups = [ "assets" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + type = "gem"; + }; + version = "2.8.1"; + }; + factory_bot = { + dependencies = [ "activesupport" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; + type = "gem"; + }; + version = "6.2.0"; + }; + factory_bot_rails = { + dependencies = [ "factory_bot" "railties" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7"; + type = "gem"; + }; + version = "6.2.0"; + }; + faker = { + dependencies = [ "i18n" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw"; + type = "gem"; + }; + version = "2.19.0"; + }; + faraday = { + dependencies = [ "faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; + type = "gem"; + }; + version = "1.8.0"; + }; + faraday-em_http = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-http-cache = { + dependencies = [ "faraday" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + type = "gem"; + }; + version = "2.2.0"; + }; + faraday-httpclient = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday_middleware = { + dependencies = [ "faraday" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + type = "gem"; + }; + version = "1.0.0"; + }; + ffi = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + type = "gem"; + }; + version = "1.15.3"; + }; + ffi-compiler = { + dependencies = [ "ffi" "rake" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + fiber-local = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9"; + type = "gem"; + }; + version = "1.0.0"; + }; + formatador = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5"; + type = "gem"; + }; + version = "0.3.0"; + }; + github_changelog_generator = { + dependencies = [ "activesupport" "async" "async-http-faraday" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04d6z2ysq3gzvpw91lq8mxmdlqcxkmvp8rw9zrzkmksh3pjdzli1"; + type = "gem"; + }; + version = "1.16.4"; + }; + gli = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sxpixpkbwi0g1lp9nv08hb4hw9g563zwxqfxd3nqp9c1ymcv5h3"; + type = "gem"; + }; + version = "2.20.1"; + }; + globalid = { + dependencies = [ "activesupport" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + type = "gem"; + }; + version = "0.5.2"; + }; + gmail_xoauth = { + dependencies = [ "oauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dslnb1kffcygcbs8sqw58w6ba0maq4w7k1i7kjrqpq0kxx6wklq"; + type = "gem"; + }; + version = "0.4.2"; + }; + guard = { + dependencies = [ "formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zqy994fr0pf3pda0x3mmkhgnfg4hd12qp5bh1s1xm68l00viwhj"; + type = "gem"; + }; + version = "2.18.0"; + }; + guard-compat = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; + type = "gem"; + }; + version = "1.2.1"; + }; + guard-livereload = { + dependencies = [ "em-websocket" "guard" "guard-compat" "multi_json" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yd74gdbbv2yz2caqwpsavzw8d5fd5y446wp8rdjw8wan0yd6k8j"; + type = "gem"; + }; + version = "2.5.2"; + }; + guard-symlink = { + dependencies = [ "guard" "guard-compat" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s5lwl8v55lq0bbvj9k3fv0l4nkl0ydd7gr1k26ycs2a80cgd5mq"; + type = "gem"; + }; + version = "0.1.1"; + }; + hashdiff = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + type = "gem"; + }; + version = "1.0.1"; + }; + hashie = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + hiredis = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04jj8k7lxqxw24sp0jiravigdkgsyrpprxpxm71ba93x1wr2w1bz"; + type = "gem"; + }; + version = "0.6.3"; + }; + htmlentities = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = [ "addressable" "http-cookie" "http-form_data" "http-parser" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + type = "gem"; + }; + version = "4.4.1"; + }; + http-accept = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; + }; + http-cookie = { + dependencies = [ "domain_name" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; + type = "gem"; + }; + version = "1.0.4"; + }; + http-form_data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; + type = "gem"; + }; + version = "2.3.0"; + }; + http-parser = { + dependencies = [ "ffi-compiler" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; + type = "gem"; + }; + version = "1.2.3"; + }; + "http_parser.rb" = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + httpclient = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + type = "gem"; + }; + version = "1.8.10"; + }; + icalendar = { + dependencies = [ "ice_cube" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wv5wq6pzq6434bnxfanvijswj2rnfvjmgisj1qg399mc42g46ls"; + type = "gem"; + }; + version = "2.7.1"; + }; + icalendar-recurrence = { + dependencies = [ "icalendar" "ice_cube" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06li3cdbwkd9y2sadjlbwj54blqdaa056yx338s4ddfxywrngigh"; + type = "gem"; + }; + version = "1.1.3"; + }; + ice_cube = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rzfydzgy6jppqvzzr76skfk07nmlszpcjzzn4wlzpsgmagmf0wq"; + type = "gem"; + }; + version = "0.16.3"; + }; + inflection = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mfkk0j0dway3p4gwzk8fnpi4hwaywl2v0iywf1azf98zhk9pfnf"; + type = "gem"; + }; + version = "1.0.0"; + }; + iniparse = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; + type = "gem"; + }; + version = "1.5.0"; + }; + interception = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01vrkn28psdx1ysh5js3hn17nfp1nvvv46wc1pwqsakm6vb1hf55"; + type = "gem"; + }; + version = "0.5"; + }; + json = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + jwt = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; + type = "gem"; + }; + version = "2.2.3"; + }; + kgio = { + groups = [ "default" "unicorn" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ipzvw7n0kz1w8rkqybyxvf3hb601a770khm0xdqm68mc4aa59xx"; + type = "gem"; + }; + version = "2.11.4"; + }; + koala = { + dependencies = [ "addressable" "faraday" "json" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k7nlif8nwgb6bfkclry41xklaf4rqf18ycgq63sgkgj6zdpda4w"; + type = "gem"; + }; + version = "3.0.0"; + }; + libv8 = { + groups = [ "mini_racer" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + type = "gem"; + }; + version = "8.4.255.0"; + }; + listen = { + dependencies = [ "rb-fsevent" "rb-inotify" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + type = "gem"; + }; + version = "3.5.1"; + }; + little-plugger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = [ "little-plugger" "multi_json" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + loofah = { + dependencies = [ "crass" "nokogiri" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + type = "gem"; + }; + version = "2.12.0"; + }; + lumberjack = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06pybb23hypc9gvs2p839ildhn26q68drb6431ng3s39i3fkkba8"; + type = "gem"; + }; + version = "1.2.8"; + }; + mail = { + dependencies = [ "mini_mime" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + fetchSubmodules = false; + rev = "9265cf75bbe376f595944bd10d2dd953f863e765"; + sha256 = "04jxql35kwijapl37h9an6127hzz0y4pnj82a9iw39kz9vva890s"; + type = "git"; + url = "https://github.com/zammad-deps/mail"; + }; + version = "2.7.2.edge"; + }; + marcel = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; + type = "gem"; + }; + version = "1.0.1"; + }; + memoizable = { + dependencies = [ "thread_safe" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + type = "gem"; + }; + version = "0.4.2"; + }; + messagebird-rest = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nj994h4ziwb72g54ma3ivb3rbfkv3yk81wwcmgykl2ik3g7q2bm"; + type = "gem"; + }; + version = "3.0.0"; + }; + method_source = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + mime-types = { + dependencies = [ "mime-types-data" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + type = "gem"; + }; + version = "3.2021.0225"; + }; + mini_mime = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl"; + type = "gem"; + }; + version = "1.1.1"; + }; + mini_portile2 = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + type = "gem"; + }; + version = "2.6.1"; + }; + mini_racer = { + dependencies = [ "libv8" ]; + groups = [ "mini_racer" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zi36qcg5qj4g1c11vwmc7lknjihirrmc6yxi6q8j6v4lfnyjbyg"; + type = "gem"; + }; + version = "0.2.9"; + }; + minitest = { + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + type = "gem"; + }; + version = "5.14.4"; + }; + msgpack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; + type = "gem"; + }; + version = "1.4.2"; + }; + multi_json = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multi_xml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + mysql2 = { + groups = [ "mysql" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; + type = "gem"; + }; + version = "0.5.3"; + }; + naught = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg"; + type = "gem"; + }; + version = "1.1.0"; + }; + nenv = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; + type = "gem"; + }; + version = "0.3.0"; + }; + nestful = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sn7lrdhp1dwn9xkqwkarby5bxx1g30givy3fi1dwp1xvqbrqikw"; + type = "gem"; + }; + version = "1.1.4"; + }; + net-ldap = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; + type = "gem"; + }; + version = "0.17.0"; + }; + netrc = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nio4r = { + groups = [ "default" "development" "puma" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + type = "gem"; + }; + version = "2.5.8"; + }; + nokogiri = { + dependencies = [ "mini_portile2" "racc" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + type = "gem"; + }; + version = "1.12.5"; + }; + nori = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + notiffany = { + dependencies = [ "nenv" "shellany" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; + type = "gem"; + }; + version = "0.1.3"; + }; + oauth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; + type = "gem"; + }; + version = "0.5.6"; + }; + oauth2 = { + dependencies = [ "faraday" "jwt" "multi_json" "multi_xml" "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; + type = "gem"; + }; + version = "1.4.7"; + }; + octokit = { + dependencies = [ "faraday" "sawyer" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + type = "gem"; + }; + version = "4.21.0"; + }; + omniauth = { + dependencies = [ "hashie" "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-facebook = { + dependencies = [ "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1z0f5sr2ddnvfva0jrfd4926nlv4528rfj7z595288n39304r092"; + type = "gem"; + }; + version = "8.0.0"; + }; + omniauth-github = { + dependencies = [ "omniauth" "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; + type = "gem"; + }; + version = "1.4.0"; + }; + omniauth-gitlab = { + dependencies = [ "omniauth" "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nbrg93p0nqxs1i2ddyij2rr7jn4vr3la4la39q4fknpin535k3z"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-google-oauth2 = { + dependencies = [ "jwt" "oauth2" "omniauth" "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a"; + type = "gem"; + }; + version = "0.8.2"; + }; + omniauth-linkedin-oauth2 = { + dependencies = [ "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ydkj9f2hd3fskpc2gazz9dim70z2k6z6pb8j3glnlhkd67iyzci"; + type = "gem"; + }; + version = "1.0.0"; + }; + omniauth-microsoft-office365 = { + dependencies = [ "omniauth" "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vw6418gykxqd9z32ddq0mr6wa737la1zwppb1ilw9sgii24rg1v"; + type = "gem"; + }; + version = "0.0.8"; + }; + omniauth-oauth = { + dependencies = [ "oauth" "omniauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; + type = "gem"; + }; + version = "1.2.0"; + }; + omniauth-oauth2 = { + dependencies = [ "oauth2" "omniauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319"; + type = "gem"; + }; + version = "1.7.1"; + }; + omniauth-rails_csrf_protection = { + dependencies = [ "actionpack" "omniauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + type = "gem"; + }; + version = "0.1.2"; + }; + omniauth-saml = { + dependencies = [ "omniauth" "ruby-saml" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + type = "gem"; + }; + version = "1.10.3"; + }; + omniauth-twitter = { + dependencies = [ "omniauth-oauth" "rack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; + type = "gem"; + }; + version = "1.4.0"; + }; + omniauth-weibo-oauth2 = { + dependencies = [ "omniauth" "omniauth-oauth2" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02cz73lj38cjqkbrdnfr7iymzqdcxgqcjy992r5hmawgpqqgxvwb"; + type = "gem"; + }; + version = "0.5.2"; + }; + openssl = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + type = "gem"; + }; + version = "2.2.0"; + }; + overcommit = { + dependencies = [ "childprocess" "iniparse" "rexml" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wbczp2pxwiggx5n925mdr2q17c6m9hq7h0q7ml2spmla29609sr"; + type = "gem"; + }; + version = "0.58.0"; + }; + parallel = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + type = "gem"; + }; + version = "1.21.0"; + }; + parser = { + dependencies = [ "ast" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; + type = "gem"; + }; + version = "3.0.2.0"; + }; + pg = { + groups = [ "postgres" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh"; + type = "gem"; + }; + version = "0.21.0"; + }; + power_assert = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01z44m715rb6nzfrc90c5rkkdiy42dv3q94jw1q8baf9dg33nwi5"; + type = "gem"; + }; + version = "2.0.1"; + }; + protocol-hpack = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sd85am1hj2w7z5hv19wy1nbisxfr1vqx3wlxjfz9xy7x7s6aczw"; + type = "gem"; + }; + version = "1.4.2"; + }; + protocol-http = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0q7js6npc8flgipjpdykmbdmhf2ml8li5gy7763y6awkpli6s6p6"; + type = "gem"; + }; + version = "0.22.4"; + }; + protocol-http1 = { + dependencies = [ "protocol-http" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wp9pi1qjh1darrqv0r46i4bvax3n64aa0mn7kza4251qmk0dwz5"; + type = "gem"; + }; + version = "0.14.1"; + }; + protocol-http2 = { + dependencies = [ "protocol-hpack" "protocol-http" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a9klpfmi7w465zq5xz8y8h1qvj42hkm0qd0nlws9d2idd767q5j"; + type = "gem"; + }; + version = "0.14.2"; + }; + pry = { + dependencies = [ "coderay" "method_source" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + type = "gem"; + }; + version = "0.14.1"; + }; + pry-rails = { + dependencies = [ "pry" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + type = "gem"; + }; + version = "0.3.9"; + }; + pry-remote = { + dependencies = [ "pry" "slop" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; + type = "gem"; + }; + version = "0.1.8"; + }; + pry-rescue = { + dependencies = [ "interception" "pry" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wn72y8y3d3g0ng350ld92nyjln012432q2z2iy9lhwzjc4dwi65"; + type = "gem"; + }; + version = "1.5.2"; + }; + pry-stack_explorer = { + dependencies = [ "binding_of_caller" "pry" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h7kp99r8vpvpbvia079i58932qjz2ci9qhwbk7h1bf48ydymnx2"; + type = "gem"; + }; + version = "0.6.1"; + }; + public_suffix = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puma = { + dependencies = [ "nio4r" ]; + groups = [ "puma" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0r22aq2shhmvi461pfs1c7pf66l4kbwndpi1jgxqydp0a1lfjbbk"; + type = "gem"; + }; + version = "4.3.10"; + }; + pundit = { + dependencies = [ "activesupport" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1i3rccbzyw46xrx1ic95r11v15ia2kj8naiyi68gdvxfrisk1fxm"; + type = "gem"; + }; + version = "2.1.1"; + }; + pundit-matchers = { + dependencies = [ "rspec-rails" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "10kvf0pj5339fh3dgf9lvsv94d74x7x1wxdb0hp8a1ac7w5l6vmm"; + type = "gem"; + }; + version = "1.7.0"; + }; + racc = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rack = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-livereload = { + dependencies = [ "rack" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1slzlmvlapgp2pc7389i0zndq3nka0s6sh445vf21cxpz7vz3p5i"; + type = "gem"; + }; + version = "0.3.17"; + }; + rack-test = { + dependencies = [ "rack" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = [ "actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q0y3nc0phg85zjxh9j78rs2hlc34zbhwn2zaw2w7bz2fc2vbxk2"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + rails-controller-testing = { + dependencies = [ "actionpack" "actionview" "activesupport" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; + type = "gem"; + }; + version = "1.0.5"; + }; + rails-dom-testing = { + dependencies = [ "activesupport" "nokogiri" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = [ "loofah" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0whc4d4jqm8kd4x3jzbax54sscm1k4pfkr5d1gpapjbzqkfj77yy"; + type = "gem"; + }; + version = "1.4.1"; + }; + railties = { + dependencies = [ "actionpack" "activesupport" "method_source" "rake" "thor" ]; + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v454xnsfh2sival85cah5wbagzzzzd7frqx9kwn4nc9m8m3yx74"; + type = "gem"; + }; + version = "6.0.4.1"; + }; + rainbow = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + raindrops = { + groups = [ "default" "unicorn" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07nikrdnsf6g55225njnzs1lm9s0lnbv2krvqd2gldwl49l7vl9x"; + type = "gem"; + }; + version = "0.19.2"; + }; + rake = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rb-fsevent = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is"; + type = "gem"; + }; + version = "0.11.0"; + }; + rb-inotify = { + dependencies = [ "ffi" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rchardet = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; + redis = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ig832dp0xmpp6a934nifzaj7wm9lzjxzasw911fagycs8p6m720"; + type = "gem"; + }; + version = "4.4.0"; + }; + regexp_parser = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; + type = "gem"; + }; + version = "2.1.1"; + }; + rest-client = { + dependencies = [ "http-accept" "http-cookie" "mime-types" "netrc" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; + type = "gem"; + }; + version = "2.1.0"; + }; + rexml = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rspec-core = { + dependencies = [ "rspec-support" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; + type = "gem"; + }; + version = "3.10.1"; + }; + rspec-expectations = { + dependencies = [ "diff-lcs" "rspec-support" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; + type = "gem"; + }; + version = "3.10.1"; + }; + rspec-mocks = { + dependencies = [ "diff-lcs" "rspec-support" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; + type = "gem"; + }; + version = "3.10.2"; + }; + rspec-rails = { + dependencies = [ "actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "152yz205p8zi5nxxhs8z581rjdvvqsfjndklkvn11f2vi50nv7n9"; + type = "gem"; + }; + version = "5.0.2"; + }; + rspec-support = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; + type = "gem"; + }; + version = "3.10.2"; + }; + rszr = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ns5qxdkgbqw1d52nz29lwx6xgs5bqwx1js1227n6l4q36g3snpp"; + type = "gem"; + }; + version = "0.5.2"; + }; + rubocop = { + dependencies = [ "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1gqsacpqzcflc8j08qx1asvcr89jjg9gqhijhir6wivjbmz700cm"; + type = "gem"; + }; + version = "1.21.0"; + }; + rubocop-ast = { + dependencies = [ "parser" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06fkn66wrsfprvd7bh0bkjvdcr17b9jy3j0cs7lbd3f2yscvwr63"; + type = "gem"; + }; + version = "1.11.0"; + }; + rubocop-faker = { + dependencies = [ "faker" "rubocop" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05d2mpi8xq50xh1s53h75hgvdhcz76lv9cnfn4jg35nbg67j1pdz"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubocop-performance = { + dependencies = [ "rubocop" "rubocop-ast" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0whjb16w70z1x0x797cfbcmqq6ngf0vkhn5qn2f2zmcin0929kgm"; + type = "gem"; + }; + version = "1.11.5"; + }; + rubocop-rails = { + dependencies = [ "activesupport" "rack" "rubocop" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sc2hbz434j6h3y1s6pzqrmdbbj6y0csfqdyjm23scwfdg7g3n07"; + type = "gem"; + }; + version = "2.12.2"; + }; + rubocop-rspec = { + dependencies = [ "rubocop" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "037v3zb1ia12sgqb2f2dd2cgrfj4scfvy29nfp5688av0wghb7fd"; + type = "gem"; + }; + version = "2.5.0"; + }; + ruby-progressbar = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + type = "gem"; + }; + version = "1.11.0"; + }; + ruby-saml = { + dependencies = [ "nokogiri" "rexml" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v21hgbhaqvz99w3jdm3s1pxwc2idjgqyw4fghzj54g9sgm0dxii"; + type = "gem"; + }; + version = "1.12.2"; + }; + ruby2_keywords = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubyntlm = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + type = "gem"; + }; + version = "2.3.0"; + }; + sassc = { + dependencies = [ "ffi" ]; + groups = [ "assets" "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; + type = "gem"; + }; + version = "2.4.0"; + }; + sassc-rails = { + dependencies = [ "railties" "sassc" "sprockets" "sprockets-rails" "tilt" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz"; + type = "gem"; + }; + version = "2.1.2"; + }; + sawyer = { + dependencies = [ "addressable" "faraday" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; + selenium-webdriver = { + dependencies = [ "childprocess" "rubyzip" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; + type = "gem"; + }; + version = "3.142.7"; + }; + shellany = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; + type = "gem"; + }; + version = "0.0.1"; + }; + shoulda-matchers = { + dependencies = [ "activesupport" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z6v2acldnvqrnvfk70f9xq39ppw5j03kbz2hpz7s17lgnn21vx8"; + type = "gem"; + }; + version = "5.0.0"; + }; + simple_oauth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; + type = "gem"; + }; + version = "0.3.1"; + }; + simplecov = { + dependencies = [ "docile" "simplecov-html" "simplecov_json_formatter" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + type = "gem"; + }; + version = "0.21.2"; + }; + simplecov-html = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + simplecov-rcov = { + dependencies = [ "simplecov" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "056fav5r7m73fkzpsrvbg0kgv905lkpmnj1l80q9msj3gfq23xn7"; + type = "gem"; + }; + version = "0.2.3"; + }; + simplecov_json_formatter = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl"; + type = "gem"; + }; + version = "0.1.3"; + }; + slack-notifier = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "001bipchr45sny33nlavqgxca9y1qqxa7xpi7pvjfqiybwzvm6nd"; + type = "gem"; + }; + version = "2.4.0"; + }; + slack-ruby-client = { + dependencies = [ "faraday" "faraday_middleware" "gli" "hashie" "websocket-driver" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11q9v6ch9jpc82z1nghwibbbbxbi23q41fcw8i57dpjmq06ma9z2"; + type = "gem"; + }; + version = "0.17.0"; + }; + slop = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; + spring = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12kyz3jdnaarhf2jbykmd9mqg085gxsx00c16la5q7czxvpb2x2r"; + type = "gem"; + }; + version = "3.0.0"; + }; + spring-commands-rspec = { + dependencies = [ "spring" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; + type = "gem"; + }; + version = "1.0.4"; + }; + spring-commands-testunit = { + dependencies = [ "spring" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qqb0iyjgl9nr7w69p07nq8ghidjcp5n81xrsn8rvafana5lis5c"; + type = "gem"; + }; + version = "1.0.1"; + }; + sprockets = { + dependencies = [ "concurrent-ruby" "rack" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = [ "actionpack" "activesupport" "sprockets" ]; + groups = [ "assets" "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + type = "gem"; + }; + version = "3.2.2"; + }; + sync = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; + tcr = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14678jlva69bxx24sz5i882x25h357xmbmqsichvq8vdiw2xf6aa"; + type = "gem"; + }; + version = "0.2.2"; + }; + telegramAPI = { + dependencies = [ "rest-client" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "043blxqk5qps62jgjyr7hbf2y2fg5ldcmii8mxk09b3c6ps9ji6g"; + type = "gem"; + }; + version = "1.4.2"; + }; + telephone_number = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0231010c9rq0sp2iss6m9lrycpwrapl2hdg1fjg9d0jg5m1ly66v"; + type = "gem"; + }; + version = "1.4.12"; + }; + term-ansicolor = { + dependencies = [ "tins" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; + test-unit = { + dependencies = [ "power_assert" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03pn837vgza8v550ggzhcxbvb80d6qivqnhv3n39lrfnsc8xgi7m"; + type = "gem"; + }; + version = "3.4.7"; + }; + thor = { + groups = [ "assets" "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + type = "gem"; + }; + version = "1.1.0"; + }; + thread_safe = { + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tilt = { + groups = [ "assets" "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + timers = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00xdi97gm01alfqhjgvv5sff9n1n2l6aym69s9jh8l9clg63b0jc"; + type = "gem"; + }; + version = "4.3.3"; + }; + tins = { + dependencies = [ "sync" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nzp88y19rqlcizp1nw8m44fvfxs9g3bhjpscz44dwfawfrmr0cb"; + type = "gem"; + }; + version = "1.29.1"; + }; + twilio-ruby = { + dependencies = [ "faraday" "jwt" "nokogiri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07g0jrd5qxzgrv10pgyxajahvmfnqx26i8kp0sxmn2in2xj6fb6c"; + type = "gem"; + }; + version = "5.58.3"; + }; + twitter = { + dependencies = [ "addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13dmkjgsnym1avym9f7y2i2h3mlk8crqvc87drrzr4f0sf9l8g2y"; + type = "gem"; + }; + version = "7.0.0"; + }; + tzinfo = { + dependencies = [ "thread_safe" ]; + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + type = "gem"; + }; + version = "1.2.9"; + }; + uglifier = { + dependencies = [ "execjs" ]; + groups = [ "assets" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.0"; + }; + unf = { + dependencies = [ "unf_ext" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + unicode-display_width = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + type = "gem"; + }; + version = "2.1.0"; + }; + unicorn = { + dependencies = [ "kgio" "raindrops" ]; + groups = [ "unicorn" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jcm85d7j7njfgims712svlgml32zjim6qwabm99645aj5laayln"; + type = "gem"; + }; + version = "6.0.0"; + }; + valid_email2 = { + dependencies = [ "activemodel" "mail" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l4xkwvx7aj5z18h6vzp0wsfjbcrl76ixp0x95wwlrhn03qab6hs"; + type = "gem"; + }; + version = "4.0.0"; + }; + vcr = { + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j9j257wjkjbh8slx6gjgcwch8x4f7pk53iaq2w71z35rm1a0a3a"; + type = "gem"; + }; + version = "6.0.0"; + }; + viewpoint = { + dependencies = [ "httpclient" "logging" "nokogiri" "rubyntlm" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14bvihfs0gzmam680xqqs07isxjk677yi3ph2pdvyyhhkbfys0l0"; + type = "gem"; + }; + version = "1.1.1"; + }; + webmock = { + dependencies = [ "addressable" "crack" "hashdiff" ]; + groups = [ "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk"; + type = "gem"; + }; + version = "3.14.0"; + }; + websocket-driver = { + dependencies = [ "websocket-extensions" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + type = "gem"; + }; + version = "0.7.5"; + }; + websocket-extensions = { + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + writeexcel = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0waaf1drp17m5qdchxqlqzj51sfa9hxqccw7d71qdg73gzay1x34"; + type = "gem"; + }; + version = "1.0.5"; + }; + xpath = { + dependencies = [ "nokogiri" ]; + groups = [ "default" "development" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; + zeitwerk = { + groups = [ "assets" "default" "development" "nulldb" "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + type = "gem"; + }; + version = "2.4.2"; + }; + zendesk_api = { + dependencies = [ "faraday" "hashie" "inflection" "mini_mime" "multipart-post" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1j50s7cw52hrjnd9v3lbfk76d44vx3sq4af7alz9hiy90gnxnd9z"; + type = "gem"; + }; + version = "1.33.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/package.json b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/package.json new file mode 100644 index 0000000000..ed5407ada9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/package.json @@ -0,0 +1,14 @@ +{ + "name": "Zammad", + "version": "1.0.0", + "devDependencies": { + "gulp": "^3.8.11", + "gulp-cheerio": "^0.6.2", + "gulp-rename": "^1.2.2", + "gulp-svgmin": "^1.1.2", + "gulp-svgstore": "^5.0.1", + "gulp-util": "^3.0.4", + "gulp-watch": "^4.2.4", + "through2": "^0.6.5" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json new file mode 100644 index 0000000000..0142e8d6fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json @@ -0,0 +1,7 @@ +{ + "owner": "zammad", + "repo": "zammad", + "rev": "ad12ad4e01f5e6d1d58da019107b66e562ae463c", + "sha256": "i50A0/dBsdvv7L/fZiA1LvJEcO3OghjjgwS/7oFjk2o=", + "fetchSubmodules": true +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix new file mode 100644 index 0000000000..216feb3e37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, makeWrapper +, bundix +, common-updater-scripts +, nix-prefetch-github +, yarn +, yarn2nix +}: + +stdenv.mkDerivation rec { + name = "zammad-update-script"; + installPhase = '' + mkdir -p $out/bin + cp ${./update.sh} $out/bin/update.sh + patchShebangs $out/bin/update.sh + wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + bundix + common-updater-scripts + nix-prefetch-github + yarn + yarn2nix + ]; + + meta = { + maintainers = with lib.maintainers; [ n0emis ]; + description = "Utility to generate Nix expressions for Zammad's dependencies"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.sh b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.sh new file mode 100755 index 0000000000..f1ddf27ac6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +set -euo pipefail + +if [ "$#" -gt 2 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the zammad packages." + echo "Usage: $0 [package name] [zammad directory in nixpkgs]" + exit 1 +fi + +VERSION=$(curl -s https://ftp.zammad.com/ | grep -v latest | grep tar.gz | sed "s/zammad-//" | sort -h | tail -n 1 | awk '{print $1}' | sed 's/.tar.gz<\/a>//') +TARGET_DIR="$2" +WORK_DIR=$(mktemp -d) +SOURCE_DIR=$WORK_DIR/zammad-$VERSION + +pushd $TARGET_DIR + +rm -rf \ + ./source.json \ + ./gemset.nix \ + ./yarn.lock \ + ./yarn.nix + + +# Check that working directory was created. +if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then + echo "Could not create temporary directory." + exit 1 +fi + +# Delete the working directory on exit. +function cleanup { + rm -rf "$WORK_DIR" +} +trap cleanup EXIT + + +pushd $WORK_DIR + +echo ":: Creating source.json" +nix-prefetch-github zammad zammad --rev $VERSION --json > $TARGET_DIR/source.json +echo >> $TARGET_DIR/source.json + +echo ":: Fetching source" +curl -L https://github.com/zammad/zammad/archive/$VERSION.tar.gz --output source.tar.gz +tar zxf source.tar.gz + +if [[ ! "$SOURCE_DIR" || ! -d "$SOURCE_DIR" ]]; then + echo "Source directory does not exists." + exit 1 +fi + +pushd $SOURCE_DIR + +echo ":: Creating gemset.nix" +bundix --lockfile=./Gemfile.lock --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix + +echo ":: Creating yarn.nix" +yarn install +cp yarn.lock $TARGET_DIR +yarn2nix > $TARGET_DIR/yarn.nix + +# needed to avoid import from derivation +cp package.json $TARGET_DIR + +popd +popd +popd diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock new file mode 100644 index 0000000000..8f51246438 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock @@ -0,0 +1,2347 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +ansi-cyan@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" + integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM= + dependencies: + ansi-wrap "0.1.0" + +ansi-gray@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" + integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE= + dependencies: + ansi-wrap "0.1.0" + +ansi-red@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" + integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw= + dependencies: + ansi-wrap "0.1.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-wrap@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" + integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo= + dependencies: + arr-flatten "^1.0.1" + array-slice "^0.2.3" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + dependencies: + arr-flatten "^1.0.1" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" + integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0= + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-differ@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" + integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= + +array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= + +array-slice@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" + integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU= + +array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" + integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== + +array-uniq@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +async-each@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +beeper@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" + integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak= + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +brace-expansion@^1.0.0: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +chalk@^1.0.0, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +cheerio@0.*: + version "0.22.0" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.0" + entities "~1.1.1" + htmlparser2 "^3.9.1" + lodash.assignin "^4.0.9" + lodash.bind "^4.1.4" + lodash.defaults "^4.0.1" + lodash.filter "^4.4.0" + lodash.flatten "^4.2.0" + lodash.foreach "^4.3.0" + lodash.map "^4.4.0" + lodash.merge "^4.4.0" + lodash.pick "^4.2.1" + lodash.reduce "^4.4.0" + lodash.reject "^4.4.0" + lodash.some "^4.4.0" + +chokidar@^1.6.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +clap@^1.0.9: + version "1.2.3" + resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" + integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA== + dependencies: + chalk "^1.1.3" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clone-stats@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" + integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= + +clone@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" + integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= + +clone@^1.0.0, clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + +coa@~1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" + integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= + dependencies: + q "^1.1.2" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +colors@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +css-select@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + +css-what@2.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== + +csso@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" + integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= + dependencies: + clap "^1.0.9" + source-map "^0.5.3" + +dateformat@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" + integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= + +debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +defaults@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +deprecated@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" + integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk= + +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +dom-serializer@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== + dependencies: + domelementtype "^1.3.0" + entities "^1.1.1" + +domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domelementtype@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domhandler@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" + integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== + dependencies: + domelementtype "1" + +domutils@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= + dependencies: + dom-serializer "0" + domelementtype "1" + +domutils@^1.5.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +duplexer2@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= + dependencies: + readable-stream "~1.1.9" + +end-of-stream@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" + integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8= + dependencies: + once "~1.3.0" + +entities@^1.1.1, entities@~1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" + integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +esprima@^2.6.0: + version "2.7.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" + integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= + dependencies: + is-posix-bracket "^0.1.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + dependencies: + fill-range "^2.1.0" + +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" + +extend-shallow@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" + integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE= + dependencies: + kind-of "^1.1.0" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + dependencies: + is-extglob "^1.0.0" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +fancy-log@^1.1.0: + version "1.3.3" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" + integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== + dependencies: + ansi-gray "^0.1.1" + color-support "^1.1.3" + parse-node-version "^1.0.0" + time-stamp "^1.0.0" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= + +fill-range@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" + integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^3.0.0" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +find-index@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" + integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ= + +findup-sync@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" + integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= + dependencies: + detect-file "^1.0.0" + is-glob "^3.1.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +fined@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== + dependencies: + expand-tilde "^2.0.2" + is-plain-object "^2.0.3" + object.defaults "^1.1.0" + object.pick "^1.2.0" + parse-filepath "^1.0.1" + +first-chunk-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" + integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= + +first-chunk-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" + integrity sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA= + dependencies: + readable-stream "^2.0.2" + +flagged-respawn@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" + integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + dependencies: + for-in "^1.0.1" + +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" + integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= + dependencies: + for-in "^1.0.1" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fsevents@^1.0.0: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gaze@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" + integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8= + dependencies: + globule "~0.1.0" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= + dependencies: + is-glob "^2.0.0" + +glob-parent@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob-stream@^3.1.5: + version "3.1.18" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" + integrity sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs= + dependencies: + glob "^4.3.1" + glob2base "^0.0.12" + minimatch "^2.0.1" + ordered-read-streams "^0.1.0" + through2 "^0.6.1" + unique-stream "^1.0.0" + +glob-watcher@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" + integrity sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs= + dependencies: + gaze "^0.5.1" + +glob2base@^0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" + integrity sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY= + dependencies: + find-index "^0.1.1" + +glob@^4.3.1: + version "4.5.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" + integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "^2.0.1" + once "^1.3.0" + +glob@~3.1.21: + version "3.1.21" + resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" + integrity sha1-0p4KBV3qUTj00H7UDomC6DwgZs0= + dependencies: + graceful-fs "~1.2.0" + inherits "1" + minimatch "~0.2.11" + +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + +globule@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" + integrity sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU= + dependencies: + glob "~3.1.21" + lodash "~1.0.1" + minimatch "~0.2.11" + +glogg@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" + integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA== + dependencies: + sparkles "^1.0.0" + +graceful-fs@^3.0.0: + version "3.0.12" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" + integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg== + dependencies: + natives "^1.1.3" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +graceful-fs@~1.2.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" + integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q= + +gulp-cheerio@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/gulp-cheerio/-/gulp-cheerio-0.6.3.tgz#40271c1703368c88408ab8750ba9bf3e1aea9c68" + integrity sha512-ZuRAq48qT9u2E8QUz1pHQZOq9500tQojOfGXzAER91CGYf8a3U5+fHuLWk5wvJ0iwrriaApg5Honvt3r5XMcNg== + dependencies: + cheerio "0.*" + plugin-error "^0.1.2" + through2 "^0.6.3" + +gulp-rename@^1.2.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd" + integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg== + +gulp-svgmin@^1.1.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/gulp-svgmin/-/gulp-svgmin-1.2.4.tgz#a4aa9e2615cf1105ef555aea86e86296cc20e273" + integrity sha1-pKqeJhXPEQXvVVrqhuhilswg4nM= + dependencies: + gulp-util "^3.0.4" + svgo "^0.7.0" + +gulp-svgstore@^5.0.1: + version "5.0.5" + resolved "https://registry.yarnpkg.com/gulp-svgstore/-/gulp-svgstore-5.0.5.tgz#4ad5cec5d753a1624a00e49cef5fc86a45d97327" + integrity sha1-StXOxddToWJKAOSc71/IakXZcyc= + dependencies: + cheerio "0.*" + gulp-util "^3.0.0" + +gulp-util@^3.0.0, gulp-util@^3.0.4, gulp-util@^3.0.7: + version "3.0.8" + resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" + integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= + dependencies: + array-differ "^1.0.0" + array-uniq "^1.0.2" + beeper "^1.0.0" + chalk "^1.0.0" + dateformat "^2.0.0" + fancy-log "^1.1.0" + gulplog "^1.0.0" + has-gulplog "^0.1.0" + lodash._reescape "^3.0.0" + lodash._reevaluate "^3.0.0" + lodash._reinterpolate "^3.0.0" + lodash.template "^3.0.0" + minimist "^1.1.0" + multipipe "^0.1.2" + object-assign "^3.0.0" + replace-ext "0.0.1" + through2 "^2.0.0" + vinyl "^0.5.0" + +gulp-watch@^4.2.4: + version "4.3.11" + resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-4.3.11.tgz#162fc563de9fc770e91f9a7ce3955513a9a118c0" + integrity sha1-Fi/FY96fx3DpH5p845VVE6mhGMA= + dependencies: + anymatch "^1.3.0" + chokidar "^1.6.1" + glob-parent "^3.0.1" + gulp-util "^3.0.7" + object-assign "^4.1.0" + path-is-absolute "^1.0.1" + readable-stream "^2.2.2" + slash "^1.0.0" + vinyl "^1.2.0" + vinyl-file "^2.0.0" + +gulp@^3.8.11: + version "3.9.1" + resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" + integrity sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ= + dependencies: + archy "^1.0.0" + chalk "^1.0.0" + deprecated "^0.0.1" + gulp-util "^3.0.0" + interpret "^1.0.0" + liftoff "^2.1.0" + minimist "^1.1.0" + orchestrator "^0.3.0" + pretty-hrtime "^1.0.0" + semver "^4.1.0" + tildify "^1.0.0" + v8flags "^2.0.2" + vinyl-fs "^0.3.0" + +gulplog@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" + integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U= + dependencies: + glogg "^1.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-gulplog@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" + integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4= + dependencies: + sparkles "^1.0.0" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + +htmlparser2@^3.9.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== + dependencies: + domelementtype "^1.3.1" + domhandler "^2.3.0" + domutils "^1.5.1" + entities "^1.1.1" + inherits "^2.0.1" + readable-stream "^3.1.1" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" + integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js= + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +interpret@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-core-module@^2.2.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== + dependencies: + has "^1.0.3" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= + +is-extglob@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + dependencies: + is-extglob "^1.0.0" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + dependencies: + is-extglob "^2.1.0" + +is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= + +is-windows@^1.0.1, is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +js-yaml@~3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" + integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= + dependencies: + argparse "^1.0.7" + esprima "^2.6.0" + +kind-of@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" + integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ= + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +liftoff@^2.1.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" + integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew= + dependencies: + extend "^3.0.0" + findup-sync "^2.0.0" + fined "^1.0.1" + flagged-respawn "^1.0.0" + is-plain-object "^2.0.4" + object.map "^1.0.0" + rechoir "^0.6.2" + resolve "^1.1.7" + +lodash._basecopy@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" + integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= + +lodash._basetostring@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" + integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U= + +lodash._basevalues@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" + integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc= + +lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + +lodash._isiterateecall@^3.0.0: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" + integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= + +lodash._reescape@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" + integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo= + +lodash._reevaluate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" + integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0= + +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + +lodash._root@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" + integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= + +lodash.assignin@^4.0.9: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" + integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= + +lodash.bind@^4.1.4: + version "4.2.1" + resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" + integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= + +lodash.defaults@^4.0.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.escape@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" + integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg= + dependencies: + lodash._root "^3.0.0" + +lodash.filter@^4.4.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= + +lodash.flatten@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.foreach@^4.3.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= + +lodash.isarguments@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + +lodash.isarray@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" + integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= + +lodash.keys@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" + integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= + dependencies: + lodash._getnative "^3.0.0" + lodash.isarguments "^3.0.0" + lodash.isarray "^3.0.0" + +lodash.map@^4.4.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= + +lodash.merge@^4.4.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.pick@^4.2.1: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= + +lodash.reduce@^4.4.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= + +lodash.reject@^4.4.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" + integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= + +lodash.restparam@^3.0.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" + integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= + +lodash.some@^4.4.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" + integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= + +lodash.template@^3.0.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" + integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8= + dependencies: + lodash._basecopy "^3.0.0" + lodash._basetostring "^3.0.0" + lodash._basevalues "^3.0.0" + lodash._isiterateecall "^3.0.0" + lodash._reinterpolate "^3.0.0" + lodash.escape "^3.0.0" + lodash.keys "^3.0.0" + lodash.restparam "^3.0.0" + lodash.templatesettings "^3.0.0" + +lodash.templatesettings@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" + integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU= + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.escape "^3.0.0" + +lodash@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" + integrity sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE= + +lru-cache@2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" + integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI= + +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== + dependencies: + kind-of "^6.0.2" + +map-cache@^0.2.0, map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +math-random@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== + +micromatch@^2.1.5: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +micromatch@^3.0.4, micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +minimatch@^2.0.1: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" + integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc= + dependencies: + brace-expansion "^1.0.0" + +minimatch@~0.2.11: + version "0.2.14" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" + integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo= + dependencies: + lru-cache "2" + sigmund "~1.0.0" + +minimist@^1.1.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.0, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +multipipe@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" + integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s= + dependencies: + duplexer2 "0.0.2" + +nan@^2.12.1: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +natives@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" + integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== + +normalize-path@^2.0.0, normalize-path@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +nth-check@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +object-assign@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" + integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.defaults@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" + integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= + dependencies: + array-each "^1.0.1" + array-slice "^1.0.0" + for-own "^1.0.0" + isobject "^3.0.0" + +object.map@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +object.pick@^1.2.0, object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +once@~1.3.0: + version "1.3.3" + resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" + integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA= + dependencies: + wrappy "1" + +orchestrator@^0.3.0: + version "0.3.8" + resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" + integrity sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4= + dependencies: + end-of-stream "~0.1.5" + sequencify "~0.0.7" + stream-consume "~0.1.0" + +ordered-read-streams@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" + integrity sha1-/VZamvjrRHO6abbtijQ1LLVS8SY= + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +parse-filepath@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" + integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= + dependencies: + is-absolute "^1.0.0" + map-cache "^0.2.0" + path-root "^0.1.1" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-node-version@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + +path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-root-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= + +path-root@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= + dependencies: + path-root-regex "^0.1.0" + +pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +plugin-error@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" + integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4= + dependencies: + ansi-cyan "^0.1.1" + ansi-red "^0.1.1" + arr-diff "^1.0.1" + arr-union "^2.0.1" + extend-shallow "^1.1.2" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + +pretty-hrtime@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + +randomatic@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" + integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== + dependencies: + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" + +"readable-stream@>=1.0.33-1 <1.1.0-0": + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + dependencies: + resolve "^1.1.6" + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== + dependencies: + is-equal-shallow "^0.1.3" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +replace-ext@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" + integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= + +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.1.6, resolve@^1.1.7: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +sax@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver@^4.1.0: + version "4.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= + +sequencify@~0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" + integrity sha1-kM/xnQLgcCf9dn9erT57ldHnOAw= + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +sigmund@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + +source-map@^0.5.3, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +sparkles@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" + integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +stream-consume@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48" + integrity sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg== + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-bom-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" + integrity sha1-+H217yYT9paKpUWr/h7HKLaoKco= + dependencies: + first-chunk-stream "^2.0.0" + strip-bom "^2.0.0" + +strip-bom@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" + integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q= + dependencies: + first-chunk-stream "^1.0.0" + is-utf8 "^0.2.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + dependencies: + is-utf8 "^0.2.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +svgo@^0.7.0: + version "0.7.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" + integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= + dependencies: + coa "~1.0.1" + colors "~1.1.2" + csso "~2.3.1" + js-yaml "~3.7.0" + mkdirp "~0.5.1" + sax "~1.2.1" + whet.extend "~0.9.9" + +through2@^0.6.1, through2@^0.6.3, through2@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= + dependencies: + readable-stream ">=1.0.33-1 <1.1.0-0" + xtend ">=4.0.0 <4.1.0-0" + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +tildify@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" + integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo= + dependencies: + os-homedir "^1.0.0" + +time-stamp@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" + integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +unc-path-regex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +unique-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" + integrity sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +user-home@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" + integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA= + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +v8flags@^2.0.2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" + integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ= + dependencies: + user-home "^1.1.1" + +vinyl-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a" + integrity sha1-p+v1/779obfRjRQPyweyI++2dRo= + dependencies: + graceful-fs "^4.1.2" + pify "^2.3.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + strip-bom-stream "^2.0.0" + vinyl "^1.1.0" + +vinyl-fs@^0.3.0: + version "0.3.14" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" + integrity sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY= + dependencies: + defaults "^1.0.0" + glob-stream "^3.1.5" + glob-watcher "^0.0.6" + graceful-fs "^3.0.0" + mkdirp "^0.5.0" + strip-bom "^1.0.0" + through2 "^0.6.1" + vinyl "^0.4.0" + +vinyl@^0.4.0: + version "0.4.6" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" + integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc= + dependencies: + clone "^0.2.0" + clone-stats "^0.0.1" + +vinyl@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" + integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4= + dependencies: + clone "^1.0.0" + clone-stats "^0.0.1" + replace-ext "0.0.1" + +vinyl@^1.1.0, vinyl@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" + integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= + dependencies: + clone "^1.0.0" + clone-stats "^0.0.1" + replace-ext "0.0.1" + +whet.extend@~0.9.9: + version "0.9.9" + resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" + integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= + +which@^1.2.14: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix new file mode 100644 index 0000000000..d0edb7987a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix @@ -0,0 +1,2669 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "ansi_cyan___ansi_cyan_0.1.1.tgz"; + path = fetchurl { + name = "ansi_cyan___ansi_cyan_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz"; + sha1 = "538ae528af8982f28ae30d86f2f17456d2609873"; + }; + } + { + name = "ansi_gray___ansi_gray_0.1.1.tgz"; + path = fetchurl { + name = "ansi_gray___ansi_gray_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; + }; + } + { + name = "ansi_red___ansi_red_0.1.1.tgz"; + path = fetchurl { + name = "ansi_red___ansi_red_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_wrap___ansi_wrap_0.1.0.tgz"; + path = fetchurl { + name = "ansi_wrap___ansi_wrap_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; + }; + } + { + name = "anymatch___anymatch_1.3.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; + }; + } + { + name = "archy___archy_1.0.0.tgz"; + path = fetchurl { + name = "archy___archy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_1.1.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz"; + sha1 = "687c32758163588fef7de7b36fabe495eb1a399a"; + }; + } + { + name = "arr_diff___arr_diff_2.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_2.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz"; + sha1 = "20f9eab5ec70f5c7d215b1077b1c39161d292c7d"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_differ___array_differ_1.0.0.tgz"; + path = fetchurl { + name = "array_differ___array_differ_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + }; + } + { + name = "array_each___array_each_1.0.1.tgz"; + path = fetchurl { + name = "array_each___array_each_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + } + { + name = "array_slice___array_slice_0.2.3.tgz"; + path = fetchurl { + name = "array_slice___array_slice_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz"; + sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; + }; + } + { + name = "array_slice___array_slice_1.1.0.tgz"; + path = fetchurl { + name = "array_slice___array_slice_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz"; + sha1 = "e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"; + }; + } + { + name = "array_uniq___array_uniq_1.0.3.tgz"; + path = fetchurl { + name = "array_uniq___array_uniq_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + } + { + name = "array_unique___array_unique_0.2.1.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "beeper___beeper_1.1.1.tgz"; + path = fetchurl { + name = "beeper___beeper_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "boolbase___boolbase_1.0.0.tgz"; + path = fetchurl { + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_1.8.5.tgz"; + path = fetchurl { + name = "braces___braces_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "cheerio___cheerio_0.22.0.tgz"; + path = fetchurl { + name = "cheerio___cheerio_0.22.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz"; + sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; + }; + } + { + name = "chokidar___chokidar_1.7.0.tgz"; + path = fetchurl { + name = "chokidar___chokidar_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + } + { + name = "clap___clap_1.2.3.tgz"; + path = fetchurl { + name = "clap___clap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz"; + sha1 = "4f36745b32008492557f46412d66d50cb99bce51"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "clone_stats___clone_stats_0.0.1.tgz"; + path = fetchurl { + name = "clone_stats___clone_stats_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz"; + sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; + }; + } + { + name = "clone___clone_0.2.0.tgz"; + path = fetchurl { + name = "clone___clone_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + } + { + name = "coa___coa_1.0.4.tgz"; + path = fetchurl { + name = "coa___coa_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz"; + sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_support___color_support_1.1.3.tgz"; + path = fetchurl { + name = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha1 = "93834379a1cc9a0c61f82f52f0d04322251bd5a2"; + }; + } + { + name = "colors___colors_1.1.2.tgz"; + path = fetchurl { + name = "colors___colors_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_util_is___core_util_is_1.0.3.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + }; + } + { + name = "css_select___css_select_1.2.0.tgz"; + path = fetchurl { + name = "css_select___css_select_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + } + { + name = "css_what___css_what_2.1.3.tgz"; + path = fetchurl { + name = "css_what___css_what_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; + sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; + }; + } + { + name = "csso___csso_2.3.2.tgz"; + path = fetchurl { + name = "csso___csso_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz"; + sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; + }; + } + { + name = "dateformat___dateformat_2.2.0.tgz"; + path = fetchurl { + name = "dateformat___dateformat_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz"; + sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "defaults___defaults_1.0.3.tgz"; + path = fetchurl { + name = "defaults___defaults_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "deprecated___deprecated_0.0.1.tgz"; + path = fetchurl { + name = "deprecated___deprecated_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz"; + sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; + }; + } + { + name = "dom_serializer___dom_serializer_0.1.1.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha1 = "1ec4059e284babed36eec2941d4a970a189ce7c0"; + }; + } + { + name = "domelementtype___domelementtype_1.3.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; + }; + } + { + name = "domelementtype___domelementtype_2.2.0.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; + }; + } + { + name = "domhandler___domhandler_2.4.2.tgz"; + path = fetchurl { + name = "domhandler___domhandler_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz"; + sha1 = "8805097e933d65e85546f726d60f5eb88b44f803"; + }; + } + { + name = "domutils___domutils_1.5.1.tgz"; + path = fetchurl { + name = "domutils___domutils_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + } + { + name = "domutils___domutils_1.7.0.tgz"; + path = fetchurl { + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; + }; + } + { + name = "duplexer2___duplexer2_0.0.2.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }; + } + { + name = "end_of_stream___end_of_stream_0.1.5.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz"; + sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; + }; + } + { + name = "entities___entities_1.1.2.tgz"; + path = fetchurl { + name = "entities___entities_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz"; + sha1 = "bdfa735299664dfafd34529ed4f8522a275fea56"; + }; + } + { + name = "entities___entities_2.2.0.tgz"; + path = fetchurl { + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "esprima___esprima_2.7.3.tgz"; + path = fetchurl { + name = "esprima___esprima_2.7.3.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + } + { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_range___expand_range_1.8.2.tgz"; + path = fetchurl { + name = "expand_range___expand_range_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + } + { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "extend_shallow___extend_shallow_1.1.4.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz"; + sha1 = "19d6bf94dfc09d76ba711f39b872d21ff4dd9071"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_0.3.2.tgz"; + path = fetchurl { + name = "extglob___extglob_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "fancy_log___fancy_log_1.3.3.tgz"; + path = fetchurl { + name = "fancy_log___fancy_log_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz"; + sha1 = "dbc19154f558690150a23953a0adbd035be45fc7"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filename_regex___filename_regex_2.0.1.tgz"; + path = fetchurl { + name = "filename_regex___filename_regex_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + } + { + name = "fill_range___fill_range_2.2.4.tgz"; + path = fetchurl { + name = "fill_range___fill_range_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; + sha1 = "eb1e773abb056dcd8df2bfdf6af59b8b3a936565"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "find_index___find_index_0.1.1.tgz"; + path = fetchurl { + name = "find_index___find_index_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz"; + sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; + }; + } + { + name = "findup_sync___findup_sync_2.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + } + { + name = "fined___fined_1.2.0.tgz"; + path = fetchurl { + name = "fined___fined_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz"; + sha1 = "d00beccf1aa2b475d16d423b0238b713a2c4a37b"; + }; + } + { + name = "first_chunk_stream___first_chunk_stream_1.0.0.tgz"; + path = fetchurl { + name = "first_chunk_stream___first_chunk_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; + sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; + }; + } + { + name = "first_chunk_stream___first_chunk_stream_2.0.0.tgz"; + path = fetchurl { + name = "first_chunk_stream___first_chunk_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + } + { + name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; + path = fetchurl { + name = "flagged_respawn___flagged_respawn_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz"; + sha1 = "e7de6f1279ddd9ca9aac8a5971d618606b3aab41"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "for_own___for_own_0.1.5.tgz"; + path = fetchurl { + name = "for_own___for_own_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + } + { + name = "for_own___for_own_1.0.0.tgz"; + path = fetchurl { + name = "for_own___for_own_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "gaze___gaze_0.5.2.tgz"; + path = fetchurl { + name = "gaze___gaze_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz"; + sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "glob_base___glob_base_0.3.0.tgz"; + path = fetchurl { + name = "glob_base___glob_base_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + } + { + name = "glob_parent___glob_parent_2.0.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + } + { + name = "glob_parent___glob_parent_3.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + } + { + name = "glob_stream___glob_stream_3.1.18.tgz"; + path = fetchurl { + name = "glob_stream___glob_stream_3.1.18.tgz"; + url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; + }; + } + { + name = "glob_watcher___glob_watcher_0.0.6.tgz"; + path = fetchurl { + name = "glob_watcher___glob_watcher_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz"; + sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; + }; + } + { + name = "glob2base___glob2base_0.0.12.tgz"; + path = fetchurl { + name = "glob2base___glob2base_0.0.12.tgz"; + url = "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz"; + sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; + }; + } + { + name = "glob___glob_4.5.3.tgz"; + path = fetchurl { + name = "glob___glob_4.5.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }; + } + { + name = "glob___glob_3.1.21.tgz"; + path = fetchurl { + name = "glob___glob_3.1.21.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz"; + sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "globule___globule_0.1.0.tgz"; + path = fetchurl { + name = "globule___globule_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz"; + sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; + }; + } + { + name = "glogg___glogg_1.0.2.tgz"; + path = fetchurl { + name = "glogg___glogg_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz"; + sha1 = "2d7dd702beda22eb3bffadf880696da6d846313f"; + }; + } + { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz"; + sha1 = "0034947ce9ed695ec8ab0b854bc919e82b1ffaef"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + }; + } + { + name = "graceful_fs___graceful_fs_1.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }; + } + { + name = "gulp_cheerio___gulp_cheerio_0.6.3.tgz"; + path = fetchurl { + name = "gulp_cheerio___gulp_cheerio_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/gulp-cheerio/-/gulp-cheerio-0.6.3.tgz"; + sha1 = "40271c1703368c88408ab8750ba9bf3e1aea9c68"; + }; + } + { + name = "gulp_rename___gulp_rename_1.4.0.tgz"; + path = fetchurl { + name = "gulp_rename___gulp_rename_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz"; + sha1 = "de1c718e7c4095ae861f7296ef4f3248648240bd"; + }; + } + { + name = "gulp_svgmin___gulp_svgmin_1.2.4.tgz"; + path = fetchurl { + name = "gulp_svgmin___gulp_svgmin_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/gulp-svgmin/-/gulp-svgmin-1.2.4.tgz"; + sha1 = "a4aa9e2615cf1105ef555aea86e86296cc20e273"; + }; + } + { + name = "gulp_svgstore___gulp_svgstore_5.0.5.tgz"; + path = fetchurl { + name = "gulp_svgstore___gulp_svgstore_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/gulp-svgstore/-/gulp-svgstore-5.0.5.tgz"; + sha1 = "4ad5cec5d753a1624a00e49cef5fc86a45d97327"; + }; + } + { + name = "gulp_util___gulp_util_3.0.8.tgz"; + path = fetchurl { + name = "gulp_util___gulp_util_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz"; + sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; + }; + } + { + name = "gulp_watch___gulp_watch_4.3.11.tgz"; + path = fetchurl { + name = "gulp_watch___gulp_watch_4.3.11.tgz"; + url = "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-4.3.11.tgz"; + sha1 = "162fc563de9fc770e91f9a7ce3955513a9a118c0"; + }; + } + { + name = "gulp___gulp_3.9.1.tgz"; + path = fetchurl { + name = "gulp___gulp_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz"; + sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; + }; + } + { + name = "gulplog___gulplog_1.0.0.tgz"; + path = fetchurl { + name = "gulplog___gulplog_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz"; + sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_gulplog___has_gulplog_0.1.0.tgz"; + path = fetchurl { + name = "has_gulplog___has_gulplog_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz"; + sha1 = "6414c82913697da51590397dafb12f22967811ce"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; + }; + } + { + name = "htmlparser2___htmlparser2_3.10.1.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_3.10.1.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_1.0.2.tgz"; + path = fetchurl { + name = "inherits___inherits_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "interpret___interpret_1.4.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; + }; + } + { + name = "is_absolute___is_absolute_1.0.0.tgz"; + path = fetchurl { + name = "is_absolute___is_absolute_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; + sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_core_module___is_core_module_2.8.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; + sha1 = "0321336c3d0925e497fd97f5d95cb114a5ccd548"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + path = fetchurl { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + } + { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + path = fetchurl { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_1.0.0.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_glob___is_glob_2.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + } + { + name = "is_glob___is_glob_3.1.0.tgz"; + path = fetchurl { + name = "is_glob___is_glob_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + } + { + name = "is_number___is_number_2.1.0.tgz"; + path = fetchurl { + name = "is_number___is_number_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_4.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; + sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + path = fetchurl { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + } + { + name = "is_primitive___is_primitive_2.0.0.tgz"; + path = fetchurl { + name = "is_primitive___is_primitive_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + } + { + name = "is_relative___is_relative_1.0.0.tgz"; + path = fetchurl { + name = "is_relative___is_relative_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; + sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"; + }; + } + { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + path = fetchurl { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; + }; + } + { + name = "is_utf8___is_utf8_0.2.1.tgz"; + path = fetchurl { + name = "is_utf8___is_utf8_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "js_yaml___js_yaml_3.7.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + }; + } + { + name = "kind_of___kind_of_1.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz"; + sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "liftoff___liftoff_2.5.0.tgz"; + path = fetchurl { + name = "liftoff___liftoff_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; + }; + } + { + name = "lodash._basecopy___lodash._basecopy_3.0.1.tgz"; + path = fetchurl { + name = "lodash._basecopy___lodash._basecopy_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; + sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; + }; + } + { + name = "lodash._basetostring___lodash._basetostring_3.0.1.tgz"; + path = fetchurl { + name = "lodash._basetostring___lodash._basetostring_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; + sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; + }; + } + { + name = "lodash._basevalues___lodash._basevalues_3.0.0.tgz"; + path = fetchurl { + name = "lodash._basevalues___lodash._basevalues_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; + sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; + }; + } + { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + path = fetchurl { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + }; + } + { + name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz"; + path = fetchurl { + name = "lodash._isiterateecall___lodash._isiterateecall_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; + sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; + }; + } + { + name = "lodash._reescape___lodash._reescape_3.0.0.tgz"; + path = fetchurl { + name = "lodash._reescape___lodash._reescape_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; + sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; + }; + } + { + name = "lodash._reevaluate___lodash._reevaluate_3.0.0.tgz"; + path = fetchurl { + name = "lodash._reevaluate___lodash._reevaluate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; + sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; + }; + } + { + name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; + path = fetchurl { + name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + }; + } + { + name = "lodash._root___lodash._root_3.0.1.tgz"; + path = fetchurl { + name = "lodash._root___lodash._root_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + } + { + name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; + path = fetchurl { + name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; + sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; + }; + } + { + name = "lodash.bind___lodash.bind_4.2.1.tgz"; + path = fetchurl { + name = "lodash.bind___lodash.bind_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz"; + sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.escape___lodash.escape_3.2.0.tgz"; + path = fetchurl { + name = "lodash.escape___lodash.escape_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz"; + sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; + }; + } + { + name = "lodash.filter___lodash.filter_4.6.0.tgz"; + path = fetchurl { + name = "lodash.filter___lodash.filter_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz"; + sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; + }; + } + { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.foreach___lodash.foreach_4.5.0.tgz"; + path = fetchurl { + name = "lodash.foreach___lodash.foreach_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; + sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; + }; + } + { + name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; + path = fetchurl { + name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + }; + } + { + name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; + path = fetchurl { + name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; + sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; + }; + } + { + name = "lodash.keys___lodash.keys_3.1.2.tgz"; + path = fetchurl { + name = "lodash.keys___lodash.keys_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz"; + sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; + }; + } + { + name = "lodash.map___lodash.map_4.6.0.tgz"; + path = fetchurl { + name = "lodash.map___lodash.map_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz"; + sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; + }; + } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + path = fetchurl { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + } + { + name = "lodash.reduce___lodash.reduce_4.6.0.tgz"; + path = fetchurl { + name = "lodash.reduce___lodash.reduce_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; + }; + } + { + name = "lodash.reject___lodash.reject_4.6.0.tgz"; + path = fetchurl { + name = "lodash.reject___lodash.reject_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz"; + sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; + }; + } + { + name = "lodash.restparam___lodash.restparam_3.6.1.tgz"; + path = fetchurl { + name = "lodash.restparam___lodash.restparam_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; + sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; + }; + } + { + name = "lodash.some___lodash.some_4.6.0.tgz"; + path = fetchurl { + name = "lodash.some___lodash.some_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz"; + sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d"; + }; + } + { + name = "lodash.template___lodash.template_3.6.2.tgz"; + path = fetchurl { + name = "lodash.template___lodash.template_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz"; + sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; + }; + } + { + name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz"; + path = fetchurl { + name = "lodash.templatesettings___lodash.templatesettings_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; + sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; + }; + } + { + name = "lodash___lodash_1.0.2.tgz"; + path = fetchurl { + name = "lodash___lodash_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz"; + sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + }; + } + { + name = "lru_cache___lru_cache_2.7.3.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_2.7.3.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + } + { + name = "make_iterator___make_iterator_1.0.1.tgz"; + path = fetchurl { + name = "make_iterator___make_iterator_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz"; + sha1 = "29b33f312aa8f547c4a5e490f56afcec99133ad6"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "math_random___math_random_1.0.4.tgz"; + path = fetchurl { + name = "math_random___math_random_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; + sha1 = "5dd6943c938548267016d4e34f057583080c514c"; + }; + } + { + name = "micromatch___micromatch_2.3.11.tgz"; + path = fetchurl { + name = "micromatch___micromatch_2.3.11.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "minimatch___minimatch_2.0.10.tgz"; + path = fetchurl { + name = "minimatch___minimatch_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + } + { + name = "minimatch___minimatch_0.2.14.tgz"; + path = fetchurl { + name = "minimatch___minimatch_0.2.14.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "multipipe___multipipe_0.1.2.tgz"; + path = fetchurl { + name = "multipipe___multipipe_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz"; + sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; + }; + } + { + name = "nan___nan_2.15.0.tgz"; + path = fetchurl { + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natives___natives_1.1.6.tgz"; + path = fetchurl { + name = "natives___natives_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; + sha1 = "a603b4a498ab77173612b9ea1acdec4d980f00bb"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "nth_check___nth_check_1.0.2.tgz"; + path = fetchurl { + name = "nth_check___nth_check_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; + sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; + }; + } + { + name = "object_assign___object_assign_3.0.0.tgz"; + path = fetchurl { + name = "object_assign___object_assign_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.defaults___object.defaults_1.1.0.tgz"; + path = fetchurl { + name = "object.defaults___object.defaults_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + } + { + name = "object.map___object.map_1.0.1.tgz"; + path = fetchurl { + name = "object.map___object.map_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + } + { + name = "object.omit___object.omit_2.0.1.tgz"; + path = fetchurl { + name = "object.omit___object.omit_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "once___once_1.3.3.tgz"; + path = fetchurl { + name = "once___once_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + } + { + name = "orchestrator___orchestrator_0.3.8.tgz"; + path = fetchurl { + name = "orchestrator___orchestrator_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; + }; + } + { + name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz"; + path = fetchurl { + name = "ordered_read_streams___ordered_read_streams_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; + sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + path = fetchurl { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + } + { + name = "parse_glob___parse_glob_3.0.4.tgz"; + path = fetchurl { + name = "parse_glob___parse_glob_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + } + { + name = "parse_node_version___parse_node_version_1.0.1.tgz"; + path = fetchurl { + name = "parse_node_version___parse_node_version_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha1 = "e2b5dbede00e7fa9bc363607f53327e8b073189b"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_dirname___path_dirname_1.0.2.tgz"; + path = fetchurl { + name = "path_dirname___path_dirname_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_root_regex___path_root_regex_0.1.2.tgz"; + path = fetchurl { + name = "path_root_regex___path_root_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + } + { + name = "path_root___path_root_0.1.1.tgz"; + path = fetchurl { + name = "path_root___path_root_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "plugin_error___plugin_error_0.1.2.tgz"; + path = fetchurl { + name = "plugin_error___plugin_error_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz"; + sha1 = "3b9bb3335ccf00f425e07437e19276967da47ace"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "preserve___preserve_0.2.0.tgz"; + path = fetchurl { + name = "preserve___preserve_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + } + { + name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; + path = fetchurl { + name = "pretty_hrtime___pretty_hrtime_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "q___q_1.5.1.tgz"; + path = fetchurl { + name = "q___q_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + } + { + name = "randomatic___randomatic_3.1.1.tgz"; + path = fetchurl { + name = "randomatic___randomatic_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; + sha1 = "b776efc59375984e36c537b2f51a1f0aff0da1ed"; + }; + } + { + name = "readable_stream___readable_stream_1.0.34.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.0.34.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "rechoir___rechoir_0.6.2.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + } + { + name = "regex_cache___regex_cache_0.4.4.tgz"; + path = fetchurl { + name = "regex_cache___regex_cache_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; + sha1 = "75bdc58a2a1496cec48a12835bc54c8d562336dd"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.4.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "replace_ext___replace_ext_0.0.1.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz"; + sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "semver___semver_4.3.6.tgz"; + path = fetchurl { + name = "semver___semver_4.3.6.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + }; + } + { + name = "sequencify___sequencify_0.0.7.tgz"; + path = fetchurl { + name = "sequencify___sequencify_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz"; + sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "sigmund___sigmund_1.0.1.tgz"; + path = fetchurl { + name = "sigmund___sigmund_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_url___source_map_url_0.4.1.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "sparkles___sparkles_1.0.1.tgz"; + path = fetchurl { + name = "sparkles___sparkles_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz"; + sha1 = "008db65edce6c50eec0c5e228e1945061dd0437c"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "stream_consume___stream_consume_0.1.1.tgz"; + path = fetchurl { + name = "stream_consume___stream_consume_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz"; + sha1 = "d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_bom_stream___strip_bom_stream_2.0.0.tgz"; + path = fetchurl { + name = "strip_bom_stream___strip_bom_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; + sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca"; + }; + } + { + name = "strip_bom___strip_bom_1.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz"; + sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + }; + } + { + name = "strip_bom___strip_bom_2.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "svgo___svgo_0.7.2.tgz"; + path = fetchurl { + name = "svgo___svgo_0.7.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz"; + sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; + }; + } + { + name = "through2___through2_0.6.5.tgz"; + path = fetchurl { + name = "through2___through2_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz"; + sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "tildify___tildify_1.2.0.tgz"; + path = fetchurl { + name = "tildify___tildify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + } + { + name = "time_stamp___time_stamp_1.1.0.tgz"; + path = fetchurl { + name = "time_stamp___time_stamp_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz"; + sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + path = fetchurl { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "unique_stream___unique_stream_1.0.0.tgz"; + path = fetchurl { + name = "unique_stream___unique_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz"; + sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "user_home___user_home_1.1.1.tgz"; + path = fetchurl { + name = "user_home___user_home_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "v8flags___v8flags_2.1.1.tgz"; + path = fetchurl { + name = "v8flags___v8flags_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz"; + sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; + }; + } + { + name = "vinyl_file___vinyl_file_2.0.0.tgz"; + path = fetchurl { + name = "vinyl_file___vinyl_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz"; + sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; + }; + } + { + name = "vinyl_fs___vinyl_fs_0.3.14.tgz"; + path = fetchurl { + name = "vinyl_fs___vinyl_fs_0.3.14.tgz"; + url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; + sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; + }; + } + { + name = "vinyl___vinyl_0.4.6.tgz"; + path = fetchurl { + name = "vinyl___vinyl_0.4.6.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + }; + } + { + name = "vinyl___vinyl_0.5.3.tgz"; + path = fetchurl { + name = "vinyl___vinyl_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz"; + sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; + }; + } + { + name = "vinyl___vinyl_1.2.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz"; + sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; + }; + } + { + name = "whet.extend___whet.extend_0.9.9.tgz"; + path = fetchurl { + name = "whet.extend___whet.extend_0.9.9.tgz"; + url = "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz"; + sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index c7500d9032..fefa884c2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -1,62 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, qt5, cmake , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsa-lib, python3 , rnnoise -, jackSupport ? false, libjack2 -, speechdSupport ? false, speechd -, pulseSupport ? false, libpulseaudio -, iceSupport ? false, zeroc-ice -, grpcSupport ? false, grpc, which , nixosTests +, poco +, flac +, libogg +, libvorbis +, grpcSupport ? false, grpc, which +, iceSupport ? true, zeroc-ice +, jackSupport ? false, libjack2 +, pipewireSupport ? true, pipewire +, pulseSupport ? true, libpulseaudio +, speechdSupport ? false, speechd }: let - generic = overrides: source: qt5.mkDerivation (source // overrides // { + generic = overrides: source: stdenv.mkDerivation (source // overrides // { pname = overrides.type; version = source.version; - patches = (source.patches or []) - ++ [ ./fix-rnnoise-argument.patch ]; - - nativeBuildInputs = [ pkg-config python3 qt5.qmake ] + nativeBuildInputs = [ cmake pkg-config python3 qt5.wrapQtAppsHook qt5.qttools ] ++ (overrides.nativeBuildInputs or [ ]); - buildInputs = [ boost protobuf avahi ] + buildInputs = [ avahi boost poco protobuf ] ++ (overrides.buildInputs or [ ]); - qmakeFlags = [ - "CONFIG+=c++11" - "CONFIG+=shared" - "CONFIG+=no-g15" - "CONFIG+=packaged" - "CONFIG+=no-update" - "CONFIG+=no-embed-qt-translations" - "CONFIG+=bundled-celt" - "CONFIG+=no-bundled-opus" - "CONFIG+=no-bundled-speex" - "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble" - ] ++ lib.optional (!speechdSupport) "CONFIG+=no-speechd" - ++ lib.optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" - ++ (overrides.configureFlags or [ ]); + cmakeFlags = [ + "-D g15=OFF" + ] ++ (overrides.configureFlags or [ ]); preConfigure = '' patchShebangs scripts ''; - makeFlags = [ "release" ]; - - installPhase = '' - runHook preInstall - - ${overrides.installPhase} - - # doc stuff - mkdir -p $out/share/man/man1 - install -Dm644 man/mum* $out/share/man/man1/ - - runHook postInstall - ''; - passthru.tests.connectivity = nixosTests.mumble; meta = with lib; { @@ -72,66 +49,63 @@ let type = "mumble"; nativeBuildInputs = [ qt5.qttools ]; - buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ lib.optional stdenv.isLinux alsa-lib + buildInputs = [ flac libogg libopus libsndfile libvorbis qt5.qtsvg rnnoise speex ] + ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional speechdSupport speechd - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional pipewireSupport pipewire; configureFlags = [ - "CONFIG+=no-server" - ]; + "-D server=OFF" + "-D bundled-celt=ON" + "-D bundled-opus=OFF" + "-D bundled-speex=OFF" + "-D bundled-rnnoise=OFF" + "-D bundle-qt-translations=OFF" + "-D update=OFF" + "-D overlay-xcompile=OFF" + "-D oss=OFF" + ] ++ lib.optional (!speechdSupport) "-D speechd=OFF" + ++ lib.optional (!pulseSupport) "-D pulseaudio=OFF" + ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" + ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON"; NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; - installPhase = '' - # bin stuff - install -Dm755 release/mumble $out/bin/mumble - install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay - - # lib stuff - mkdir -p $out/lib/mumble - cp -P release/libmumble.so* $out/lib - cp -P release/libcelt* $out/lib/mumble - cp -P release/plugins/* $out/lib/mumble - - # icons - install -Dm644 scripts/mumble.desktop $out/share/applications/mumble.desktop - install -Dm644 icons/mumble.svg $out/share/icons/hicolor/scalable/apps/mumble.svg + postFixup = '' + wrapProgram $out/bin/mumble \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire)}" ''; } source; server = source: generic { type = "murmur"; - postPatch = lib.optionalString iceSupport '' - grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' - ''; - configureFlags = [ - "CONFIG+=no-client" - ] ++ lib.optional (!iceSupport) "CONFIG+=no-ice" - ++ lib.optional grpcSupport "CONFIG+=grpc"; + "-D client=OFF" + ] ++ lib.optional (!iceSupport) "-D ice=OFF" + ++ lib.optionals iceSupport [ + "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" + "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" + "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice" + ] + ++ lib.optional grpcSupport "-D grpc=ON"; buildInputs = [ libcap ] ++ lib.optional iceSupport zeroc-ice ++ lib.optionals grpcSupport [ grpc which ]; - - installPhase = '' - # bin stuff - install -Dm755 release/murmurd $out/bin/murmurd - ''; } source; source = rec { - version = "1.3.4"; + version = "unstable-1.4.231"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = version; - sha256 = "sha256-njovShQpW0JNeeE8VugdmGzDk3fKG8/fcJoBgdyTZug="; + rev = "9e0e274d6a9d8a9919267e747d05d0500d150560"; + sha256 = "0whvb4nlf7gjf2v7wsaq0ir18mshhw5wi8c9q9qz43wnh42nn2qi"; fetchSubmodules = true; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/third_party/nixpkgs/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch deleted file mode 100644 index 78e8ed24d5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch +++ /dev/null @@ -1,16 +0,0 @@ -nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise -changed the argument rnnoise_create[1], - -[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f - ---- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 -+++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 -@@ -106,7 +106,7 @@ - #endif - - #ifdef USE_RNNOISE -- denoiseState = rnnoise_create(); -+ denoiseState = rnnoise_create(NULL); - #endif - - qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index ed813881a1..0626645113 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -85,13 +85,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.0" = { + "@azure/ms-rest-js-2.6.1" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz"; - sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz"; + sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -265,13 +265,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@opentelemetry/api-1.1.0" = { @@ -445,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.178" = { + "@types/lodash-4.14.179" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.178"; + version = "4.14.179"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; - sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; + sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; }; }; "@types/lossless-json-1.0.1" = { @@ -472,31 +472,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.45" = { + "@types/node-12.20.46" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.45"; + version = "12.20.46"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.45.tgz"; - sha512 = "1Jg2Qv5tuxBqgQV04+wO5u+wmSHbHgpORCJdeCLM+E+YdPElpdHhgywU+M1V1InL8rfOtpqtOjswk+uXTKwx7w=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; + sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; }; }; - "@types/node-17.0.17" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.17"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz"; - sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; - "@types/node-fetch-2.5.12" = { + "@types/node-fetch-2.6.1" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.12"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; - sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA=="; }; }; "@types/promise-ftp-1.3.4" = { @@ -976,13 +976,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1073.0" = { + "aws-sdk-2.1083.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1073.0"; + version = "2.1083.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1073.0.tgz"; - sha512 = "TtyHDL4ZEs8Zh/DqWY/hv745DTWrIwOyBAvfjBJ45RE9h0TjpWqCIowEtb6gRPAKyPPyfGH4s+rEYu07vNK1Hg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz"; + sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1174,13 +1174,13 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.19.1" = { + "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; "body-parser-xml-2.0.3" = { @@ -1318,13 +1318,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bytes-3.1.1" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "call-bind-1.0.2" = { @@ -1777,13 +1777,13 @@ let sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; }; }; - "cookie-0.4.1" = { + "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; "cookie-signature-1.0.6" = { @@ -1795,13 +1795,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.21.0" = { + "core-js-3.21.1" = { name = "core-js"; packageName = "core-js"; - version = "3.21.0"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; - sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; + sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; }; }; "core-util-is-1.0.2" = { @@ -1894,6 +1894,15 @@ let sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; + "cssfilter-0.0.10" = { + name = "cssfilter"; + packageName = "cssfilter"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; + sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2434,13 +2443,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "express-4.17.2" = { + "express-4.17.3" = { name = "express"; packageName = "express"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; }; "extend-3.0.2" = { @@ -2587,13 +2596,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.8" = { + "follow-redirects-1.14.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.8"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz"; - sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; }; "for-each-0.3.3" = { @@ -3595,13 +3604,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.2" = { + "isbot-3.4.3" = { name = "isbot"; packageName = "isbot"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.2.tgz"; - sha512 = "b59O14840ltLAGq8z+M8VhL+1CdrjbZYQIhQBPacutjl27Ypa2/UksJ1DRzWOz19F5H/2d2pstbdAp7+b0ph+A=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.3.tgz"; + sha512 = "5hAgiY9ysMIJcVQlGHcXptwgZr1yYbIGNBE36a3sPo7cLZ9eLTLx0qOssekFKaTHiXTwd/ZZMTuOS7w4faOmpw=="; }; }; "isexe-2.0.0" = { @@ -4288,13 +4297,13 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.1.1" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz"; - sha512 = "reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; "minimist-1.2.5" = { @@ -4441,13 +4450,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.0" = { + "mssql-6.4.1" = { name = "mssql"; packageName = "mssql"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz"; - sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; + sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; }; }; "mute-stream-0.0.8" = { @@ -4477,49 +4486,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.104.0" = { + "n8n-core-0.106.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.104.0"; + version = "0.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz"; - sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz"; + sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw=="; }; }; - "n8n-design-system-0.11.0" = { + "n8n-design-system-0.12.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz"; - sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz"; + sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw=="; }; }; - "n8n-editor-ui-0.130.0" = { + "n8n-editor-ui-0.132.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.130.0"; + version = "0.132.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.130.0.tgz"; - sha512 = "UNvZ3CTcqmxJs1JuhLPSMo18nlakzFYAyJ8UKwCvAOGVfGltHweVeaKHnAEs0legDAkdJ3yEtaebTrQjF+dCoA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz"; + sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg=="; }; }; - "n8n-nodes-base-0.161.0" = { + "n8n-nodes-base-0.163.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.161.0"; + version = "0.163.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.161.0.tgz"; - sha512 = "WRTzmzDO3dKZF6WRzQ/d6w2TaYLoPUb+X1kjDWaxF5omwz6UFc63dVtJ+irhyQR8wRj3/ytdrS3xEMDxZ9vXlg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz"; + sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw=="; }; }; - "n8n-workflow-0.86.0" = { + "n8n-workflow-0.88.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.86.0"; + version = "0.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz"; - sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz"; + sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ=="; }; }; "named-placeholders-1.1.2" = { @@ -4540,13 +4549,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.2.0" = { + "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "native-duplexpair-1.0.0" = { @@ -5566,13 +5575,13 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.6" = { + "qs-6.9.7" = { name = "qs"; packageName = "qs"; - version = "6.9.6"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; "querystring-0.2.0" = { @@ -5656,13 +5665,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.2" = { + "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; "rc-1.2.8" = { @@ -6259,13 +6268,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.6" = { + "snowflake-sdk-1.6.7" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz"; - sha512 = "b8mbYI6TFGe8H0m0eviNd4FC/3jsw02OHNt21k9sLWkBp4re2VUhaJf7555ln7thMSnMcbkdAB8zQBZcbqdoPg=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz"; + sha512 = "pisHqO5ALTggbNhE7LGEG5bnD6NKebcqyirOl4IsoKsD7g6d+vC3gHgRR/cm8kAH1GhLHY/WwhDq2fr7lundpA=="; }; }; "source-map-0.6.1" = { @@ -7015,13 +7024,13 @@ let sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; }; }; - "url-parse-1.5.6" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.6"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.6.tgz"; - sha512 = "xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "utf7-1.0.2" = { @@ -7141,13 +7150,13 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm2-3.9.7" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.7"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz"; - sha512 = "g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "vue-fragment-1.5.2" = { @@ -7366,6 +7375,15 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; + "xss-1.0.10" = { + name = "xss"; + packageName = "xss"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; + sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + }; + }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -7462,10 +7480,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.163.1"; + version = "0.165.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.163.1.tgz"; - sha512 = "lhup+qIy3cG0oWvBuOWi57Tn3F2k5NBD00KJ3ilKgnk4VsY+LmAca2xvyZNKvlRPa9i++3ukG6XioPTDuXylgw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz"; + sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7506,7 +7524,7 @@ in ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.0" // { + (sources."@azure/ms-rest-js-2.6.1" // { dependencies = [ sources."form-data-2.5.1" ]; @@ -7551,7 +7569,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.6" // { + (sources."@oclif/parser-3.8.7" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7574,11 +7592,11 @@ in sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.178" + sources."@types/lodash-4.14.179" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.17" - (sources."@types/node-fetch-2.5.12" // { + sources."@types/node-17.0.21" + (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -7646,7 +7664,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1073.0" // { + (sources."aws-sdk-2.1083.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7700,7 +7718,7 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -7719,7 +7737,7 @@ in sources."buffer-writer-2.0.0" sources."bull-3.29.3" sources."byte-length-1.0.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" @@ -7817,9 +7835,9 @@ in sources."content-disposition-0.5.4" sources."content-type-1.0.4" sources."convict-6.2.1" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.21.0" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" (sources."crc-32-1.2.1" // { dependencies = [ @@ -7839,6 +7857,7 @@ in sources."csrf-3.1.0" sources."css-select-4.2.1" sources."css-what-5.1.0" + sources."cssfilter-0.0.10" sources."dashdash-1.14.1" sources."date-utils-1.2.21" sources."debug-4.3.3" @@ -7902,7 +7921,7 @@ in sources."eventsource-1.1.0" sources."exit-on-epipe-1.0.1" sources."expand-tilde-2.0.2" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -7933,7 +7952,7 @@ in }) sources."flatted-3.2.5" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.8" + sources."follow-redirects-1.14.9" sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-4.0.0" @@ -8059,7 +8078,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.2" + sources."isbot-3.4.3" sources."isexe-2.0.0" sources."iso-639-1-2.1.13" sources."isstream-0.1.2" @@ -8162,7 +8181,7 @@ in sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.1" + sources."minimatch-3.1.2" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -8196,7 +8215,7 @@ in ]; }) sources."ms-2.1.2" - sources."mssql-6.4.0" + sources."mssql-6.4.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ @@ -8205,19 +8224,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.104.0" // { + (sources."n8n-core-0.106.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.11.0" - sources."n8n-editor-ui-0.130.0" - (sources."n8n-nodes-base-0.161.0" // { + sources."n8n-design-system-0.12.0" + sources."n8n-editor-ui-0.132.1" + (sources."n8n-nodes-base-0.163.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.86.0" + sources."n8n-workflow-0.88.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8225,7 +8244,7 @@ in ]; }) sources."nanoclone-0.2.1" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."native-duplexpair-1.0.0" (sources."nearley-2.20.1" // { dependencies = [ @@ -8393,7 +8412,7 @@ in }) sources."punycode-2.1.1" sources."python-struct-1.1.3" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -8403,7 +8422,7 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" @@ -8494,7 +8513,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."snowflake-sdk-1.6.6" // { + (sources."snowflake-sdk-1.6.7" // { dependencies = [ sources."agent-base-4.3.0" sources."debug-3.2.7" @@ -8545,7 +8564,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.45" + sources."@types/node-12.20.46" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8627,7 +8646,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.6" + sources."url-parse-1.5.10" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -8643,7 +8662,7 @@ in sources."validator-13.7.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm2-3.9.7" + sources."vm2-3.9.9" sources."vue-fragment-1.5.2" sources."vue-i18n-8.27.0" sources."webidl-conversions-3.0.1" @@ -8676,6 +8695,11 @@ in sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" + (sources."xss-1.0.10" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 874c0f8a17..3a63f98c44 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,17 +17,18 @@ , qtgraphicaleffects , sqlite , inkscape +, xdg-utils }: mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8="; + sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA="; }; patches = [ @@ -62,6 +63,7 @@ mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" # See also: https://bugreports.qt.io/browse/QTBUG-85967 "--set QML_DISABLE_DISK_CACHE 1" + "--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index 3560e8066d..ff6760d3da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; rev = "v${version}"; - sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9"; + sha256 = "0f32jf2rds9543akysxinf3hsgzr0w880xwcrcm1r2r0nhp8b8s5"; }; disabled = !python3Packages.isPy3k; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix index 0719c137ab..45307504d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix @@ -29,21 +29,18 @@ mkDerivation rec { ''; desktopItem = makeDesktopItem { - type = "Application"; name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; comment = "Network packet and traffic generator and analyzer with a friendly GUI"; - categories = "Network"; - terminal = "false"; - startupNotify = "true"; + categories = [ "Network" ]; + startupNotify = true; exec = "$out/bin/ostinato"; icon = ostinatoIcon; - extraEntries = '' - GenericName[it]=Generatore ed Analizzatore di pacchetti di rete - Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole - ''; - fileValidation = false; + extraConfig = { + "GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete"; + "Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole"; + }; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix index b3b277bf13..e4c1c8f5b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/default.nix @@ -18,7 +18,7 @@ let exec = "frostwire"; icon = "frostwire"; comment = "Search and explore all kinds of files on the Bittorrent network"; - categories = "Network;FileTransfer;P2P;"; + categories = [ "Network" "FileTransfer" "P2P" ]; }; # fake build to pre-download deps into fixed-output derivation diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 02c383b30f..cfee9d91c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,28 +1,41 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.5"; + version = "6.9.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java mv $(ls */*.jar) $out/share/java makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : $out/share/java \ + --set JAVA_HOME "${jre}" + + substituteInPlace $out/share/java/frostwire \ + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ + "export JAVA_PROGRAM_DIR=${jre}/bin/" + + substituteInPlace $out/share/java/frostwire.desktop \ + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" + + runHook postInstall ''; meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix deleted file mode 100644 index 94a4642b2d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake -, extra-cmake-modules, qtbase, qtscript -, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig -, kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, taglib, libgcrypt, kplotting -}: - -mkDerivation rec { - pname = "ktorrent"; - version = "${libktorrent.mainVersion}"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase qtscript - karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem - libktorrent taglib libgcrypt kplotting - ]; - - meta = with lib; { - description = "KDE integrated BtTorrent client"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - license = licenses.gpl2; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index 0a2f90ecb7..da7633221a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -49,13 +49,9 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = lib.concatStringsSep ";" [ - "Application" "Network" "FileTransfer" "P2P" "GTK" - ]; - startupNotify = "true"; - mimeType = lib.concatStringsSep ";" [ - "application/x-bittorrent" "x-scheme-handler/magnet" - ]; + categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + startupNotify = true; + mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix index 5a0d3e4870..8b0fad83b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.11.1"; + version = "2.12"; src = fetchFromGitHub { owner = pname; repo = "pjproject"; rev = version; - sha256 = "sha256-mqtlxQDIFee93wpdn8oNWmMPDyjYTCmVqF6IJvJbRBM="; + sha256 = "sha256-snp9+PlffU9Ay8o42PM8SqyP60hu9nozp457HM+0bM8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 890553b338..54d7c5c681 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -12,8 +12,8 @@ let icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; - categories = "Network;"; - startupNotify = "false"; + categories = [ "Network" ]; + startupNotify = false; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index f9450c5882..19e8d1eeba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-OLz/f4E+Haumw5Jaw+F1hiHz0jfcywhfK3fEUgLorao="; + sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 58ce130a73..efce24a06f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -7,6 +7,7 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome +, withLibsecret ? true }: with lib; @@ -29,15 +30,16 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ]; + ] ++ optionals withLibsecret [ libsecret ]; cmakeFlags = [ "-DWITH_VTE=OFF" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" + "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index ee9467467c..be0832a075 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -105,7 +105,7 @@ let desktopName = "VMware Horizon Client"; icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png"; exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u"; - mimeType = "x-scheme-handler/vmware-view"; + mimeTypes = [ "x-scheme-handler/vmware-view" ]; }; binLinkCommands = lib.concatMapStringsSep diff --git a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index 7d5d414a4f..f2cd1282fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.5"; + version = "8.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; + sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 4dd603dae1..4b6ae464e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.89"; + version = "2.90"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; + sha256 = "sha256-PZe/yUJGcj3/nIYaf7eAbiJIA2YASJ8nlMLIWWKJrbo="; }; vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; 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 0b95023ad5..d698601cb1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,8 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, genericUpdater -, common-updater-scripts +, gitUpdater , makeWrapper , openssh }: @@ -25,9 +24,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { - updateScript = genericUpdater { + updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; ignoredVersions = ".(rc|beta).*"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix index 0223c153f5..4d0fd11928 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix @@ -26,7 +26,7 @@ let comment = "Client for the decentralized social network Secure Scuttlebutt"; desktopName = "Patchwork"; genericName = "Patchwork"; - categories = "Network;"; + categories = [ "Network" ]; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 9759516edd..3e0ed7a502 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -60,12 +60,9 @@ stdenv.mkDerivation rec { genericName = "File synchronization tool"; exec = "unison"; icon = "unison"; - categories = "Utility;FileTools;GTK;"; - extraDesktopEntries = { - StartupWMClass = "Unison"; - StartupNotify = "true"; - X-MultipleArgs = "false"; - }; + categories = [ "Utility" "FileTools" "GTK" ]; + startupNotify = true; + startupWMClass = "Unison"; }); meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 76bddac6c2..31d0ce461d 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.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; + sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; }; - vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; + vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index c699781376..6e9093373c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -8,23 +8,26 @@ , lib , udev , wrapGAppsHook +, libxshmfence }: stdenv.mkDerivation rec { pname = "termius"; - version = "7.17.1"; + version = "7.34.1"; src = fetchurl { # find the latest version with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version' # and the url with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap"; - sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg="; + # and the sha512 with + # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_101.snap"; + sha512 = "7fdd82535fd288277b01fedde4739dc97782236fbf25372efa56114bba676c21277ed96b32a1d46ac86af19925b14935818af50985d43a1307639530db044af4"; }; desktopItem = makeDesktopItem { - categories = "Network;"; + categories = [ "Network" ]; comment = "The SSH client that works on Desktop and Mobile"; desktopName = "Termius"; exec = "termius-app"; @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; unpackPhase = '' runHook preUnpack diff --git a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix index cd0b47a395..5f889f6c5e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = "v${version}"; - sha256 = "016qpsb4dv9qb3ab3hmvk4vzf4ipr3xgmzv2cx46pxxsj0gnigd8"; + sha256 = "sha256-SZfGiKSbLq81YdDMgG0C6LC/nE5NApqeWK/PqDzQNBU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index 05bb88bdfe..abc8e33fd3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.2"; + version = "0.0.3"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "1fvv4mlgf0vqcq5zh0zl2xr44saz0sm47r8whcywwrmcm0l66iv6"; + sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; }; nativeBuildInputs = [ @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { ''; preFixup = let - libPath = lib.makeLibraryPath [ + binPath = lib.makeBinPath [ xdg-user-dirs ]; in '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/app_flowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/:${libPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${binPath}" ''; desktopItems = [ @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { desktopName = "AppFlowy"; comment = meta.description; exec = "appflowy"; - categories = "Office;"; + categories = [ "Office" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix index adeb087ae8..e4b46c5bc2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -55,6 +55,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://espanso.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat ]; + platforms = platforms.linux; longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 964d17587a..255dba6229 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "jabref"; desktopName = "JabRef"; genericName = "Bibliography manager"; - categories = "Office;"; + categories = [ "Office" ]; icon = "jabref"; exec = "jabref"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index 678c3bb357..767a4202ae 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -17,7 +17,8 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Office;"; + icon = "jameica"; + categories = [ "Office" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index bfe72a7115..b461b2ba19 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-IWGeb0+IiFNYJ+jQAzGYfQ5FnrbR6HIpynS9jgd5/mY="; + sha256 = "sha256-5/85ro206o3SsvAvcZeDD2Dmo2jU4zXmtI3X4WdQaRI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix index 2fcb2388b8..e3ca9af422 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ng/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , nixosTests , python3 , ghostscript @@ -54,6 +55,15 @@ py.pkgs.pythonPackages.buildPythonApplication rec { sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; }; + patches = [ + # Fix the `slow_write_pdf` test: + # https://github.com/NixOS/nixpkgs/issues/136626 + (fetchpatch { + url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; + sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; + }) + ]; + format = "other"; # Make bind address configurable @@ -155,27 +165,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; - doCheck = true; - checkInputs = with py.pkgs.pythonPackages; [ - pytest - pytest-cov - pytest-django - pytest-env - pytest-sugar - pytest-xdist - factory_boy - ]; - - # The tests require: - # - PATH with runtime binaries - # - A temporary HOME directory for gnupg - # - XDG_DATA_DIRS with test-specific fonts - checkPhase = '' - pushd src - PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest - popd - ''; - installPhase = '' mkdir -p $out/lib cp -r . $out/lib/paperless-ng @@ -185,6 +174,31 @@ py.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; + checkInputs = with py.pkgs.pythonPackages; [ + pytest-django + pytest-env + pytest-sugar + pytest-xdist + factory_boy + pytestCheckHook + ]; + + pytestFlagsArray = [ "src" ]; + + # The tests require: + # - PATH with runtime binaries + # - A temporary HOME directory for gnupg + # - XDG_DATA_DIRS with test-specific fonts + preCheck = '' + export PATH="${path}:$PATH" + export HOME=$(mktemp -d) + export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" + + # Disable unneeded code coverage test + substituteInPlace src/setup.cfg \ + --replace "--cov --cov-report=html" "" + ''; + passthru = { # PYTHONPATH of all dependencies used by the package pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix index 9b6f352d97..8f08b56d4d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 4ddc0b4e27..f1eb43dbdb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 16ee7733ed..f80f40929a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -16,6 +16,7 @@ , texlive , imagemagick , perlPackages +, writeScript }: let @@ -27,12 +28,19 @@ let imagemagick perlPackages.Po4a ]; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; in python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit src version; pname = "paperwork"; + sample_docs = sample_documents // { + # a trick for the update script + name = "sample_documents"; + src = sample_documents; + }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: @@ -69,7 +77,7 @@ python3Packages.buildPythonApplication rec { export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share # build the user manual - PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do install -Dt $site/model/help/out $i done @@ -122,12 +130,20 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - python-dateutil setuptools ]; disallowedRequisites = documentation_deps; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix + docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" + update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev + ''; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix index a5141a43e5..980a4aabf7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; + sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index fc1b329c43..ecabdb85a9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -18,18 +18,18 @@ let icon = "portfolio"; comment = "Calculate Investment Portfolio Performance"; desktopName = "Portfolio Performance"; - categories = "Office;"; + categories = [ "Office" ]; }; runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.56.2"; + version = "0.56.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-4iMLn0KTrH7MOlNduSl7BMOZKPakHhhQdR3NQXV2ZZU="; + sha256 = "sha256-g/MjOrivqbZ93iSs5mLQT36gn72KCJEOgEssBZER+TA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix b/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix index b7261dca5a..6a63aba4a1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { desktopName = "Pyspread"; genericName = "Spreadsheet"; comment = meta.description; - categories = "Office;Development;Spreadsheet;"; + categories = [ "Office" "Development" "Spreadsheet" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 20449b1911..121c1ccf36 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.7"; + version = "22.2.9"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "f7c97f3dc3435ecdc740131548aacd390332c8b97c4e6fee98a3e80985786533"; + sha256 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix b/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix deleted file mode 100644 index 6cdbea7559..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, - kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, - libksane -}: - -mkDerivation rec { - pname = "skanlite"; - version = "2.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ="; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase - kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets - libksane - ]; - - meta = with lib; { - description = "KDE simple image scanning application"; - homepage = "https://apps.kde.org/skanlite"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ polendri ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix index 614c6574fa..a97b3f7d37 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/desktop_items.nix @@ -5,38 +5,92 @@ name = "${pname}-planmaker"; desktopName = "${suiteName} PlanMaker"; icon = "${pname}-pml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-planmaker %F"; - mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; - extraEntries = '' - TryExec=${pname}-planmaker - StartupWMClass=pm - ''; + tryExec = "${pname}-planmaker"; + mimeTypes = [ + "application/x-pmd" + "application/x-pmdx" + "application/x-pmv" + "application/excel" + "application/x-excel" + "application/x-ms-excel" + "application/x-msexcel" + "application/x-sylk" + "application/x-xls" + "application/xls" + "application/vnd.ms-excel" + "application/vnd.stardivision.calc" + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + "application/vnd.openxmlformats-officedocument.spreadsheetml.template" + "application/vnd.ms-excel.sheet.macroenabled.12" + "application/vnd.ms-excel.template.macroEnabled.12" + "application/x-dif" + "text/spreadsheet" + "text/csv" + "application/x-prn" + "application/vnd.ms-excel.sheet.binary.macroenabled.12" + ]; + startupWMClass = "pm"; }; presentations = makeDesktopItem { name = "${pname}-presentations"; desktopName = "${suiteName} Presentations"; icon = "${pname}-prl"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-presentations %F"; - mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; - extraEntries = '' - TryExec=${pname}-presentations - StartupWMClass=pr - ''; + tryExec = "${pname}-presentations"; + mimeTypes = [ + "application/x-prdx" + "application/x-prvx" + "application/x-prsx" + "application/x-prd" + "application/x-prv" + "application/x-prs" + "application/ppt" + "application/mspowerpoint" + "application/vnd.ms-powerpoint" + "application/vnd.openxmlformats-officedocument.presentationml.presentation" + "application/vnd.ms-powerpoint.presentation.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.template" + "application/vnd.ms-powerpoint.template.macroEnabled.12" + "application/vnd.ms-powerpoint.slideshow.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.slideshow" + ]; + startupWMClass = "pr"; }; textmaker = makeDesktopItem { name = "${pname}-textmaker"; desktopName = "${suiteName} TextMaker"; icon = "${pname}-tml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-textmaker %F"; - mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; - extraEntries = '' - TryExec=${pname}-textmaker - StartupWMClass=tm - ''; + tryExec = "${pname}-textmaker"; + mimeTypes = [ + "application/x-tmdx" + "application/x-tmvx" + "application/x-tmd" + "application/x-tmv" + "application/msword" + "application/vnd.ms-word" + "application/x-doc" + "text/rtf" + "application/rtf" + "application/vnd.oasis.opendocument.text" + "application/vnd.oasis.opendocument.text-template" + "application/vnd.stardivision.writer" + "application/vnd.sun.xml.writer" + "application/vnd.sun.xml.writer.template" + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" + "application/vnd.ms-word.document.macroenabled.12" + "application/vnd.openxmlformats-officedocument.wordprocessingml.template" + "application/vnd.ms-word.template.macroenabled.12" + "application/x-pocket-word" + "application/x-dbf" + "application/msword-template" + ]; + startupWMClass = "tm"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix index 5267771624..b8b98c19bb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix @@ -37,9 +37,8 @@ python3.pkgs.buildPythonApplication rec { name = "timeline"; comment = "Display and navigate information on a timeline"; icon = "timeline"; - terminal = false; exec = "timeline"; - categories = "Office;Calendar;"; + categories = [ "Office" "Calendar" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 0c72bc9641..c73c0b87c0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -8,7 +8,7 @@ let icon = "trilium"; comment = description; desktopName = "Trilium Notes"; - categories = "Office"; + categories = [ "Office" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix b/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix index d54f27f9bb..5bfc8ebc97 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix @@ -17,7 +17,7 @@ let icon = icon; desktopName = pname; genericName = "Evernote desktop app"; - categories = "Application"; + categories = [ "Application" ]; }; in appimageTools.wrapType2 rec { diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 178b2351a6..46f2569b13 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { installPhase = let steam-run = (steam.override { extraPkgs = p: buildInputs; - nativeOnly = true; }).run; in '' prefix=$out/opt/kingsoft/wps-office diff --git a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix b/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix deleted file mode 100644 index d0d8374e64..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/zanshin/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, extra-cmake-modules -, boost -, akonadi-calendar -, kontactinterface -, krunner -}: - -mkDerivation rec { - pname = "zanshin"; - version = "21.12.2"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; - sha256 = "sha256-zMCV4KIrqeKHEsMbqEbnm/DgQiGxZbZXDVMuSSrXj8Y="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - buildInputs = [ - boost - akonadi-calendar - kontactinterface - krunner - ]; - - meta = with lib; { - description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = "https://zanshin.kde.org/"; - maintainers = with maintainers; [ zraexy ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 74f05a0b40..6fb8aecbbc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -94,13 +94,12 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; exec = "zotero -url %U"; icon = "zotero"; - type = "Application"; comment = meta.description; desktopName = "Zotero"; genericName = "Reference Management"; - categories = "Office;Database;"; - startupNotify = "true"; - mimeType = "text/plain"; + categories = [ "Office" "Database" ]; + startupNotify = true; + mimeTypes = [ "text/plain" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix b/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix index 255f7761be..8c1d5f2129 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/svxlink/default.nix @@ -9,7 +9,7 @@ let icon = "qtel"; desktopName = name; genericName = "EchoLink Client"; - categories = "HamRadio;Qt;Network;"; + categories = [ "HamRadio" "Qt" "Network" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index 29f8ec7b5e..93836cee28 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99"; + sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix index 3864058828..26e8fe11a3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix @@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation rec { exec = "gprojector"; desktopName = "G.Projector"; comment = meta.description; - categories = "Science;"; - extraEntries = "StartupWMClass = gov-nasa-giss-projector-GProjector"; + categories = [ "Science" ]; + startupWMClass = "gov-nasa-giss-projector-GProjector"; }) ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix new file mode 100644 index 0000000000..02e00cd19a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: + +stdenv.mkDerivation rec { + pname = "angsd"; + version = "0.937"; + + src = fetchFromGitHub { + owner = "ANGSD"; + repo = "angsd"; + sha256 = "1020gh066dprqhfi90ywqzqqnq7awn49wrkkjnizmmab52v00kxs"; + rev = "${version}"; + }; + + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; + + meta = with lib; { + description = "Program for analysing NGS data"; + homepage = "http://www.popgen.dk/angsd"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index f6aa5e8892..c04d6af080 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-t++Iron8tVZYxb6i6MuOdWsFXhOGADbWvhN1Z4KqGcs="; + sha256 = "sha256-GIXMtFCobpegCqkF1zgcqeB72JZ8BXBaYdAAfS4iKW4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/default.nix new file mode 100644 index 0000000000..e334637f24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook +, sshSupport ? true, openssl, libssh +, tetgenSupport ? true, tetgen +, ffmpegSupport ? true, ffmpeg +, dicomSupport ? false, dcmtk +, withModelRepo ? true +, withCadFeatures ? false +}: + +stdenv.mkDerivation rec { + pname = "febio-studio"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = "FEBioStudio"; + rev = "v${version}"; + sha256 = "0r6pg49i0q9idp7pjymj7mlxd63qjvmfvg0l7fmx87y1yd2hfw4h"; + }; + + patches = [ + ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags + ]; + + cmakeFlags = [ + "-DQt_Ver=5" + "-DNOT_FIRST=On" + "-DOpenGL_GL_PREFERENCE=GLVND" + ] + ++ lib.optional sshSupport "-DUSE_SSH=On" + ++ lib.optional tetgenSupport "-DUSE_TETGEN=On" + ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On" + ++ lib.optional dicomSupport "-DUSE_DICOM=On" + ++ lib.optional withModelRepo "-DMODEL_REPO=On" + ++ lib.optional withCadFeatures "-DCAD_FEATURES=On" + ; + + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -R bin $out/ + runHook postInstall + ''; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ zlib libglvnd libGLU openssl libssh ] + ++ lib.optional sshSupport openssl + ++ lib.optional tetgenSupport tetgen + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional dicomSupport dcmtk + ; + + meta = with lib; { + description = "FEBio Suite Solver"; + license = with licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = platforms.unix; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch b/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch new file mode 100644 index 0000000000..e694f6c3b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch @@ -0,0 +1,38 @@ +diff --git a/FEBioStudio/RepositoryPanel.cpp b/FEBioStudio/RepositoryPanel.cpp +index 382db303..314cdc68 100644 +--- a/FEBioStudio/RepositoryPanel.cpp ++++ b/FEBioStudio/RepositoryPanel.cpp +@@ -1364,10 +1364,10 @@ void CRepositoryPanel::loadingPageProgress(qint64 bytesSent, qint64 bytesTotal) + + #else + +-CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QWidget* parent){} ++CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QDockWidget* parent){} + CRepositoryPanel::~CRepositoryPanel(){} + void CRepositoryPanel::OpenLink(const QString& link) {} +-// void CRepositoryPanel::Raise() {} ++void CRepositoryPanel::Raise() {} + void CRepositoryPanel::SetModelList(){} + void CRepositoryPanel::ShowMessage(QString message) {} + void CRepositoryPanel::ShowWelcomeMessage(QByteArray messages) {} +@@ -1396,6 +1396,7 @@ void CRepositoryPanel::on_actionSearch_triggered() {} + void CRepositoryPanel::on_actionClearSearch_triggered() {} + void CRepositoryPanel::on_actionDeleteRemote_triggered() {} + void CRepositoryPanel::on_actionModify_triggered() {} ++void CRepositoryPanel::on_actionCopyPermalink_triggered() {} + void CRepositoryPanel::on_treeWidget_itemSelectionChanged() {} + void CRepositoryPanel::on_treeWidget_customContextMenuRequested(const QPoint &pos) {} + void CRepositoryPanel::DownloadItem(CustomTreeWidgetItem *item) {} +diff --git a/FEBioStudio/WzdUpload.cpp b/FEBioStudio/WzdUpload.cpp +index 5ce74346..20062e06 100644 +--- a/FEBioStudio/WzdUpload.cpp ++++ b/FEBioStudio/WzdUpload.cpp +@@ -1183,7 +1183,7 @@ void CWzdUpload::on_saveJson_triggered() + getProjectJson(&projectInfo); + + QFile file(filedlg.selectedFiles()[0]); +- file.open(QIODeviceBase::WriteOnly); ++ file.open(QIODevice::WriteOnly); + file.write(projectInfo); + file.close(); + } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 68cdd9f120..bbe661b4f0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1260"; + version = "1268"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-bJNvoHr2sQYtiC3tr1GA0T0kRhDyx6hU3OOSTvKUSCs="; + sha256 = "sha256-9yzeLg3xporl32sZ1Ks8s63jXJNGUiI64XyQmhbQF4M="; }; nativeBuildInputs = [ unzip ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genomic sequence aligner"; - homepage = "http://last.cbrc.jp/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/mcfrith/last"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index bba8a02b76..7e162e2d27 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + installPhase = '' mkdir -p $out/bin cp minimap2 $out/bin @@ -25,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; - badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } 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 804407968e..4dc850f506 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - pname = "neuron"; + pname = "neuron${lib.optionalString useMpi "-mpi"}"; version = "7.5"; nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 33d581ffd0..526a5b3ed3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.10"; + version = "2.26.11"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-hKBWRmzyMVXiEmsz/eYbVIUhezZdSJnBvcgv6ShPI5U="; + sha256 = "sha256-0swggo1a5gExpj3VgaWKT/TYd7rfSFBcqRrAURnTPjM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix index 6e747e318f..d02d472662 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - pname = "RAxML"; + pname = "RAxML${lib.optionalString useMpi "-mpi"}"; version = "8.2.12"; src = fetchFromGitHub { owner = "stamatak"; - repo = "standard-${pname}"; + repo = "standard-RAxML"; rev = "v${version}"; sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix index f5e21db4b5..74260bacab 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/d-seams/default.nix @@ -2,13 +2,13 @@ , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { - version = "v1.0.1"; + version = "1.0.1"; pname = "d-SEAMS"; src = fetchFromGitHub { owner = "d-SEAMS"; repo = "seams-core"; - rev = "v1.0.1"; + rev = "v${version}"; sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index d1d6b43699..5860279d56 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -12,19 +12,27 @@ let exec = "jmol"; desktopName = "JMol"; genericName = "Molecular Modeler"; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in stdenv.mkDerivation rec { - version = "14.32.21"; + version = "14.32.28"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-jJw/y6lQ0bvzOmwOhedufxK0Tuq9Pq6lIPZ97o03Zec="; + sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix index 39bbae77a6..5f7c0c1f6b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix @@ -24,8 +24,16 @@ let genericName = "Molecular Modeler"; comment = description; icon = pname; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix index 987f6156b4..ff4e3809fc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix @@ -27,7 +27,7 @@ let comment = "Multi platform circuit layout and schematic drawing tool"; exec = "diylc"; icon = "diylc_icon"; - categories = "Development;Electronics;"; + categories = [ "Development" "Electronics" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 2fb3b8c8b1..5b4c8eb790 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -27,7 +27,7 @@ let comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix index 94457c81ce..f48d08d407 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 837f25e320..096a648b4d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -12,36 +12,33 @@ let }; useDune2 = true; - - nativeBuildInputs = [ which ]; - in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src useDune2 nativeBuildInputs; + inherit version src useDune2; configureFlags = pname; + nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src useDune2 nativeBuildInputs; + inherit version src useDune2; configureFlags = pname; - buildInputs = with ocamlPackages; [ menhir ]; + nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); }; in ocamlPackages.buildDunePackage { - inherit pname version src useDune2 nativeBuildInputs; + inherit pname version src useDune2; configureFlags = pname; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ - cmdliner menhir ]) - ; + nativeBuildInputs = [ which ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix index 72e412fc3b..bb60b2b832 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/anders/default.nix @@ -13,7 +13,10 @@ ocamlPackages.buildDunePackage rec { sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; }; - buildInputs = with ocamlPackages; [ zarith menhir ]; + strictDeps = true; + + nativeBuildInputs = [ ocamlPackages.menhir ]; + buildInputs = [ ocamlPackages.zarith ]; meta = with lib; { description = "Modal Homotopy Type System"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index bdd2796add..29959be2fa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -69,7 +69,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2; + ocamlBuildInputs = [] ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.13") ocamlPackages.num ++ optional (versionAtLeast "8.13") ocamlPackages.zarith; @@ -79,7 +81,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs; + inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -129,6 +131,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ] + ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook ++ optional (!versionAtLeast "8.6") gnumake42; @@ -137,7 +140,6 @@ self = stdenv.mkDerivation { (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) - ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; postPatch = '' @@ -168,7 +170,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" "coqide" ] ++ optional (!versionAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; @@ -179,7 +181,7 @@ self = stdenv.mkDerivation { icon = "coq"; desktopName = "CoqIDE"; comment = "Graphical interface for the Coq proof assistant"; - categories = "Development;Science;Math;IDE;GTK"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index 0f04100242..aaac288b61 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, rlwrap, perl, makeDesktopItem }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { substituteInPlace lib/Tools/env \ --replace /usr/bin/env ${coreutils}/bin/env + substituteInPlace src/Tools/Setup/src/Environment.java \ + --replace 'cmd.add("/usr/bin/env");' "" \ + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + rm -r heaps '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} @@ -90,6 +94,24 @@ stdenv.mkDerivation rec { buildPhase = '' export HOME=$TMP # The build fails if home is not set + setup_name=$(basename contrib/isabelle_setup*) + + #The following is adapted from https://isabelle.sketis.net/repos/isabelle/file/Isabelle2021-1/Admin/lib/Tools/build_setup + TARGET_DIR="contrib/$setup_name/lib" + rm -rf "$TARGET_DIR" + mkdir -p "$TARGET_DIR/isabelle/setup" + declare -a ARGS=("-Xlint:unchecked") + + SOURCES="$(${perl}/bin/perl -e 'while (<>) { if (m/(\S+\.java)/) { print "$1 "; } }' "src/Tools/Setup/etc/build.props")" + for SRC in $SOURCES + do + ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC" + done + ${java}/bin/javac -d "$TARGET_DIR" -classpath ${scala}/lib/scala-compiler.jar "''${ARGS[@]}" + ${java}/bin/jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle + rm -rf "$TARGET_DIR/isabelle" + + # Prebuild HOL Session bin/isabelle build -v -o system_heaps -b HOL ''; @@ -114,7 +136,7 @@ stdenv.mkDerivation rec { icon = "isabelle"; desktopName = "Isabelle"; comment = meta.description; - categories = "Education;Science;Math;"; + categories = [ "Education" "Science" "Math" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix index 762acbe4ec..85a7ecb08c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { comment = meta.description; desktopName = "KeY"; genericName = "KeY"; - categories = "Science;"; + categories = [ "Science" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix index 688c8c319b..67e699bc63 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim-evolution"; icon = "logisim-evolution"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix index b4741aaed8..06dc024e6d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/logisim/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim"; icon = "logisim"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix index 90a4aeb4f8..14b3055ab3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { pname = "tlaps"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { - url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; - sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + url = "https://tla.msr-inria.inria.fr/tlaps/dist/${version}/tlaps-${version}.tar.gz"; + sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; buildInputs = [ ocaml isabelle cvc3 perl wget which ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ florentc ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 21c60d03ac..7b1ee4384c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -18,10 +18,8 @@ let comment = "IDE for TLA+"; desktopName = name; genericName = comment; - categories = "Development"; - extraEntries = '' - StartupWMClass=TLA+ Toolbox - ''; + categories = [ "Development" ]; + startupWMClass = "TLA+ Toolbox"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix index 7863148655..0f3dab8038 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-${version}.tar.gz"; - sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; + url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; + sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; }; buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir menhirLib + ocaml findlib ocamlgraph zarith menhir # Emacs compilation of why3.el emacs # Documentation @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { coqPackages.coq coqPackages.flocq ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip menhirLib num re sexplib ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index 2829cb5934..0c20faceb5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-KErKYK3mmjp5uNdGQnjzUUIEwXT5fqbAPUunH72Mtig="; + sha256 = "sha256-5J4HOTz92ALUcZZr15jJ6vplc3KDwbFCXqjEhlOV4kE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index 7ebfe2030d..8ab498c61d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -15,8 +15,8 @@ let desktopName = "Geogebra"; genericName = "Geogebra"; comment = meta.description; - categories = "Education;Science;Math;"; - mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; + categories = [ "Education" "Science" "Math" ]; + mimeTypes = [ "application/vnd.geogebra.file" "application/vnd.geogebra.tool" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix index 7515d6d344..5713f84a86 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://getdp.info/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 76fc20c4b0..4306ae0915 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-rP8zQtGQfEKaS+PkWW7UT2zUP9WpSrdWZ/SGPNzy92k="; + sha256 = "sha256-/9ZJAIRCCHGciNkaZsKBiJAjEyt6nigsUVSMufbzrUQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index 91ee7c1c65..dc947a9400 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "9.1.2"; + version = "9.5.0"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b"; + sha256 = "sha256-u1QuWl0WhfbjZOrwXqbFVySF/8N6IkUWnPPLQCiLwp4="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 03f4b22380..7ba5838fab 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.22.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-BarbO25c103YImOOnjVgwgqpa3mUVvndgJeUHRf2I60="; + sha256 = "sha256-l9lR5MVHWiRz5RG/I/nXRY4GQSSaXXP7PlRNoAu9+yo="; }; hardeningDisable = [ "format" ]; 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 2066087692..70e24e2608 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -1,5 +1,7 @@ { pkgs , withDoc ? false +, requireSageTests ? true +, extraPythonPackages ? ps: [] }: # Here sage and its dependencies are put together. Some dependencies may be pinned @@ -109,7 +111,7 @@ let rpy2 sphinx pillow - ]; + ] ++ extraPythonPackages python3.pkgs; pythonEnv = python3.buildEnv.override { extraLibs = pythonRuntimeDeps; @@ -166,5 +168,5 @@ in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition; - inherit withDoc; + inherit withDoc requireSageTests; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix index 5805a5c7b0..96122fba5a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix @@ -6,6 +6,7 @@ , jupyter-kernel , sagedoc , withDoc +, requireSageTests }: # A wrapper that makes sure sage finds its docs (if they were build) and the @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - + ] ++ lib.optionals requireSageTests [ # This is a hack to make sure sage-tests is evaluated. It doesn't acutally # produce anything of value, it just decouples the tests from the build. sage-tests 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 356630329b..bd2f94ac4a 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 @@ -9,15 +9,15 @@ , glib , gnome , gobject-introspection -, gtk3 +, gtk4 , libxml2 , pkg-config , python3Packages -, wrapGAppsHook }: +, wrapGAppsHook4 }: python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.4.1"; + version = "0.5.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "RogerCrocker"; repo = "BadaBib"; rev = "v${version}"; - sha256 = "sha256-kub2lLauru2RrinzxMDyBVC0htPx0Niv/M6bbmTS7Hk="; + sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo="; }; nativeBuildInputs = [ @@ -35,13 +35,13 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ gdk-pixbuf glib - gtk3 + gtk4 ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix index 390a421c1a..b3647e0f1b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220217222804"; + version = "3.1.20220221074232"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "sha256-7zID/lChliEJxu6Dawz9DNP2YvSwtMo8G+ooXNh2Phc="; + sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix index b22c6294fb..ed92dfb90d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/netlogo/default.nix @@ -8,7 +8,7 @@ let icon = name; comment = "A multi-agent programmable modeling environment"; desktopName = "NetLogo"; - categories = "Science;"; + categories = [ "Science" ]; }; in diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index dd4bb6ef14..69810f95b8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2021.5"; + version = "2022"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "1dh9l2gcv61h1r6qsg8vr3k1xp8jgd27czzg24kzf4k823k3z9pb"; + sha256 = "0s1bv8nvmdpiyk2yhcmzq8q936hm5jgnqb393101drh2dih0vmps"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix index 86d77072ee..f4c323defd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix @@ -7,7 +7,7 @@ let icon = "groove"; desktopName = "GROOVE Simulator"; comment = "GRaphs for Object-Oriented VErification"; - categories = "Science;ComputerScience;"; + categories = [ "Science" "ComputerScience" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 78c6c0988c..e7730ba4b9 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q/ulRgU6zNLRZUjL83O/Krx85voPWZPZDo65CLp/aOg="; }; - cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM="; + cargoSha256 = "sha256-S1V8hDuzp4sf6945gqs8QNVdu8jwPGVYjVbV6EY28Hk="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index 4920372411..d84aa984a3 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -106,10 +106,8 @@ stdenv.mkDerivation rec { comment = "Terminal emulator"; desktopName = "mlterm"; genericName = "Terminal emulator"; - categories = lib.concatStringsSep ";" [ - "Application" "System" "TerminalEmulator" - ]; - startupNotify = "false"; + categories = [ "Application" "System" "TerminalEmulator" ]; + startupNotify = false; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 0e9402cf49..1ca84149fd 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -21,7 +21,7 @@ let comment = description; desktopName = "URxvt"; genericName = pname; - categories = "System;TerminalEmulator;"; + categories = [ "System" "TerminalEmulator" ]; }; fetchPatchFromAUR = { package, name, rev, sha256 }: diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix index c217ae7f99..0538a2060a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilix/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tilix"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = version; - sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; + sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; }; # Default upstream else LDC fails to link diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix index c6f39effed..f3751e3988 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix @@ -21,15 +21,12 @@ let desktopItem = makeDesktopItem { desktopName = "Wayst"; name = "wayst"; + genericName = "Terminal"; exec = "wayst"; icon = "wayst"; - terminal = "false"; - categories = "System;TerminalEmulator"; + categories = [ "System" "TerminalEmulator" ]; + keywords = [ "wayst" "terminal" ]; comment = "A simple terminal emulator"; - extraEntries = '' - GenericName=Terminal - Keywords=wayst;terminal; - ''; }; in stdenv.mkDerivation rec { 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 738260646f..0f9bc33a90 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 = "370"; + version = "371"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; + sha256 = "MviIJ3sZ4o68CjESv/AAYHwHvtBnnKoL7rs2+crUhPU="; }; strictDeps = true; 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 b8befad558..0aa3f0d02a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -1,33 +1,46 @@ { buildPythonApplication -, lib -, fetchFromGitHub -, poetry -, termcolor -, questionary , colorama , decli -, tomlkit +, fetchFromGitHub +, git , jinja2 -, pyyaml -, argcomplete -, typing-extensions +, lib , packaging -, pytestCheckHook +, poetry , pytest-freezegun , pytest-mock , pytest-regressions -, git +, pytestCheckHook +, pyyaml +, questionary +, termcolor +, tomlkit +, typing-extensions + +, argcomplete, fetchPypi }: +let + # NOTE: Upstream requires argcomplete <2, so we make it here. + argcomplete_1 = argcomplete.overrideAttrs (old: rec { + version = "1.12.3"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU="; + }; + }); +in + buildPythonApplication rec { pname = "commitizen"; - version = "2.20.4"; + version = "2.21.2"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2DhWiUAkAkyNxYB1CGzUB2nGZeCWvFqSztrxasUPSXw="; + sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ="; deepClone = true; }; @@ -43,7 +56,7 @@ buildPythonApplication rec { tomlkit jinja2 pyyaml - argcomplete + argcomplete_1 typing-extensions packaging ]; @@ -54,7 +67,7 @@ buildPythonApplication rec { pytest-freezegun pytest-mock pytest-regressions - argcomplete + argcomplete_1 git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 0e6302534a..867efc6ece 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; + sha256 = "0iimdzfdl5687xyqxfadbn640x45n3933q1nfx7b32rl4v3vk778"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix index a5ea070ec0..7bb0dec9eb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -3,32 +3,41 @@ , fetchFromGitHub , installShellFiles , makeWrapper +, bash +, coreutils , git , pandoc }: -buildGoModule rec { +let + version = "1.2.1"; + commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57"; +in buildGoModule { pname = "gg-scm"; - version = "1.1.0"; + inherit version; src = fetchFromGitHub { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; + sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95"; }; - patches = [ ./skip-broken-revert-tests.patch ]; + postPatch = '' + substituteInPlace cmd/gg/editor_unix.go \ + --replace /bin/sh ${bash}/bin/sh + ''; subPackages = [ "cmd/gg" ]; ldflags = [ "-s" "-w" "-X" "main.versionInfo=${version}" - "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" + "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; + vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; - nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; - buildInputs = [ git ]; + nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; + checkInputs = [ bash coreutils git ]; + buildInputs = [ bash git ]; postInstall = '' wrapProgram $out/bin/gg --suffix PATH : ${git}/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch deleted file mode 100644 index f8540952ae..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go -index 9420e9b..ff6ca93 100644 ---- a/cmd/gg/revert_test.go -+++ b/cmd/gg/revert_test.go -@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) { - } - - func TestRevert_UnknownFile(t *testing.T) { -+ t.Skip("Broken in 1.1.0") - t.Parallel() - t.Run("EmptyRepo", func(t *testing.T) { - t.Parallel() diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 3774b43d37..5d96929282 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-T0xThL4VHzpNMQV8fTVnG7R+D9ol/Z7a4MYMXbkQ680="; + sha256 = "sha256-60XEc0V8stbl+JozTqu8yO37K1NXX/X2xFkcO9p/QNY="; }; - vendorSha256 = "sha256-tJg/vekGUYP4q1ZP5UV3+lXv6bht4doVV3IaGH+4uf8="; + vendorSha256 = "sha256-aMD4a+jwCINcHV/z5UyTF+o3BzN9wviz+kLwDys9/BI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 6a765f8e8b..87bd4d891c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.5.1"; + version = "1.7.8"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; - rev = version; - sha256 = "sha256-HkOMG7VG8jyvr1W1T/62murtNYE8wyT/p3lDtuxfm5M="; + rev = "v${version}"; + sha256 = "sha256-NZlPcr13onxgbmKPdv0ODOhYDT5T+OeSvHE8VGOGyo4="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 47d6cc023b..449634ae69 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,36 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib +, stdenv +, fetchFromGitea +, rustPlatform +, libiconv +, Security +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.7"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "lunaryorn"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; repo = pname; rev = "v${version}"; - sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; + sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE="; }; - cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r"; + cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk="; - nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; - postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" - ''; - meta = with lib; { - description = "Cleanup stale Git branches of pull requests"; - homepage = "https://github.com/lunaryorn/git-gone"; + description = "Cleanup stale Git branches of merge requests"; + homepage = "https://codeberg.org/flausch/git-gone"; + changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index 7d91fb7754..e1129a7274 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg"; + sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko="; }; - cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY="; + cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 4124ca67e6..54dbc195f0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.12"; + version = "3.3.13"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-Mdjm7rkF/iw3HBftCgXrbFCG00g/RowFcF/oeKLyzL0="; + sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-review/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-review/default.nix index 40061baca5..98c9c5312e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-review/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-review/default.nix @@ -4,8 +4,7 @@ , pbr , requests , setuptools -, genericUpdater -, common-updater-scripts +, gitUpdater }: buildPythonApplication rec { @@ -42,10 +41,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "git_review" ]; - passthru.updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Tool to submit code to Gerrit"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 513fdd67cd..37000982d8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.1"; + version = "1.16.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-CaJ6Br8Sy+8GuoI8UWxsn3oGEp6R3X5kvl9vDKZB1bc="; + sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index b5372233c2..55a2f1627b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -93,7 +93,7 @@ let icon = pname; desktopName = "GitKraken"; genericName = "Git Client"; - categories = "Development;"; + categories = [ "Development" ]; comment = "Graphical Git client from Axosoft"; }) ]; 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 5b8bd65a51..462ff47afd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.7.2", - "repo_hash": "1jnwbcsswvy6jjrc2jclrxyyxi54caf8w51sgyiqaik5s3p4wgnx", - "yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7", + "version": "14.8.2", + "repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc", + "yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.7.2-ee", + "rev": "v14.8.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.7.2", - "GITLAB_PAGES_VERSION": "1.51.0", - "GITLAB_SHELL_VERSION": "13.22.2", - "GITLAB_WORKHORSE_VERSION": "14.7.2" + "GITALY_SERVER_VERSION": "14.8.2", + "GITLAB_PAGES_VERSION": "1.54.0", + "GITLAB_SHELL_VERSION": "13.23.2", + "GITLAB_WORKHORSE_VERSION": "14.8.2" } } 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 f53c693c90..362cf4702f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper }: let @@ -120,7 +120,7 @@ stdenv.mkDerivation { inherit src; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper ]; patches = [ @@ -174,6 +174,9 @@ stdenv.mkDerivation { # rake tasks to mitigate CVE-2017-0882 # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake + + # manually patch the shebang line in generate-loose-foreign-key + wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test' ''; passthru = { 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 70dd9c594c..78296dff88 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.4' +gem 'activesupport', '~> 6.1.4.6' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false 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 fd0dea027e..752883d801 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 @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) 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.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.13.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -219,13 +219,13 @@ GEM with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.4) + activesupport (~> 6.1.4.6) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) 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 51c9dd71f1..b5a05dde1b 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 @@ -1,23 +1,9 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2, openssl, zlib, pcre, http-parser }: +, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: let - # git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0. - # It needs a specific commit in between those two releases. - libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec { - version = "1.2.0"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; - sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; - }; - - patches = []; - }); - rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -25,7 +11,7 @@ let gemdir = ./.; }; - version = "14.7.2"; + version = "14.8.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -37,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-gtQmRryTYwT2e4lamWYJ7Ri7dEGI7vg/Ir1gnuGmHQg="; + sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM="; }; - vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo="; + vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34="; passthru = { inherit rubyEnv; @@ -50,7 +36,7 @@ buildGoModule { tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' @@ -65,7 +51,7 @@ buildGoModule { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ roblabla globin fpletz talyz ]; + maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ]; license = licenses.mit; }; } 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 9539139fe4..c55d094db5 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 @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; ice_nine = { source = { @@ -394,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.13.0"; + version = "2.14.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -994,9 +994,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 9dabd7c949..99ad72a266 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.22.2"; + version = "13.23.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-jAH/MKmCIybLXsypHehQJaKf+mK9ko5XqWoDH/XKE5w="; + sha256 = "sha256-aee+Tn81o1iK1Xm5et6lKUN8//lyGh3NGs96Mwg4nFc="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-cE6phpVYcZNCEk6bElEksIf4GOr/5vJPRdlGCubRafE="; + vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin @@ -26,7 +26,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } 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 a8e1b11d7e..76273acdff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.7.2"; + version = "14.8.2"; src = fetchFromGitLab { owner = data.owner; @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 2026808875..2b50530740 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -207,3 +207,13 @@ index 567c7540777..29906b1c132 100644 end end end +diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key +index 35f84c64ce1..c2fecf3404c 100755 +--- a/scripts/decomposition/generate-loose-foreign-key ++++ b/scripts/decomposition/generate-loose-foreign-key +@@ -1,4 +1,4 @@ +-#!/usr/bin/env -S ENABLE_SPRING=0 bin/rails runner -e test ++#!/usr/bin/env rails + + # This is helper script to swap foreign key to loose foreign key + # using DB schema 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 aab373095f..4ae8b33569 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.4' +gem 'rails', '~> 6.1.4.6' gem 'bootsnap', '~> 1.9.1', require: false @@ -72,7 +72,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.11' -gem 'rubyzip', '~> 2.0.0', require: 'zip' +gem 'rubyzip', '~> 2.3.2', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.9' @@ -183,7 +183,7 @@ gem 'rack', '~> 2.2.3' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 5.5.2', require: false + gem 'puma', '~> 5.6.2', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -195,7 +195,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.3' +gem 'sidekiq', '~> 6.4' gem 'sidekiq-cron', '~> 1.2' gem 'redis-namespace', '~> 1.8.1' gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' @@ -295,7 +295,7 @@ gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem 'gitlab-license', '~> 2.0' +gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' @@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.3' +gem 'gitlab-labkit', '~> 0.22.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -396,7 +396,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.6.1', require: false + gem 'gitlab-dangerfiles', '~> 2.8.0', require: false end group :development, :test, :coverage do @@ -466,21 +466,14 @@ gem 'sys-filesystem', '~> 1.4.3' # NTP client gem 'net-ntp' -# SSH host key support -gem 'net-ssh', '~> 6.0' -gem 'sshkey', '~> 2.0' - -# Required for ED25519 SSH host key support -group :ed25519 do - gem 'ed25519', '~> 1.2' - gem 'bcrypt_pbkdf', '~> 1.1' -end +# SSH keys support +gem 'ssh_data', '~> 1.2' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.6.0.pre.rc1' +gem 'gitaly', '~> 14.8.0.pre.rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -496,7 +489,7 @@ gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.6.5' +gem 'gitlab-experiment', '~> 0.7.0' # Structured logging gem 'lograge', '~> 0.5' 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 e036b98f33..a7f75fb0e2 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 @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.9) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailer (6.1.4.6) + actionpack (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) 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.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (6.1.4.6) + actionpack (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (6.1.4.6) + activesupport (= 6.1.4.6) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) + activemodel (6.1.4.6) + activesupport (= 6.1.4.6) + activerecord (6.1.4.6) + activemodel (= 6.1.4.6) + activesupport (= 6.1.4.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) + activestorage (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activesupport (= 6.1.4.6) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -130,7 +130,6 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - bcrypt_pbkdf (1.1.0) benchmark (0.1.1) benchmark-ips (2.3.0) benchmark-memory (0.1.2) @@ -186,7 +185,7 @@ GEM childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) - claide (1.0.3) + claide (1.1.0) claide-plugins (0.9.2) cork nap @@ -195,7 +194,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.2) concurrent-ruby (1.1.9) - connection_pool (2.2.2) + connection_pool (2.2.5) contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) @@ -301,7 +300,6 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - ed25519 (1.2.4) elasticsearch (6.8.2) elasticsearch-api (= 6.8.2) elasticsearch-transport (= 6.8.2) @@ -444,7 +442,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.6.0.pre.rc1) + gitaly (14.8.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -452,13 +450,12 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.6.1) + gitlab-dangerfiles (2.8.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.6.5) + gitlab-experiment (0.7.0) activesupport (>= 3.0) request_store (>= 1.0) - scientist (~> 1.6, >= 1.6.0) gitlab-fog-azure-rm (1.2.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -466,15 +463,15 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.21.3) + gitlab-labkit (0.22.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) - jaeger-client (~> 1.1) + jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) - gitlab-license (2.0.0) + gitlab-license (2.1.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -626,7 +623,7 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) @@ -635,7 +632,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -937,7 +934,7 @@ GEM tty-markdown tty-prompt public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) @@ -963,20 +960,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (6.1.4.6) + actioncable (= 6.1.4.6) + actionmailbox (= 6.1.4.6) + actionmailer (= 6.1.4.6) + actionpack (= 6.1.4.6) + actiontext (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activemodel (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) bundler (>= 1.15.0) - railties (= 6.1.4.4) + railties (= 6.1.4.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -990,9 +987,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) method_source rake (>= 0.13) thor (~> 1.0) @@ -1024,13 +1021,13 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.2.1) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) @@ -1127,7 +1124,7 @@ GEM sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (2.0.0) + rubyzip (2.3.2) rugged (1.2.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) @@ -1140,9 +1137,8 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) + sassc (2.4.0) ffi (~> 1.9) - rake sassc-rails (2.1.0) railties (>= 4.0.0) sassc (>= 2.0) @@ -1152,7 +1148,6 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scientist (1.6.2) sd_notify (0.1.0) securecompare (1.0.0) seed-fu (2.3.7) @@ -1169,7 +1164,7 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (6.3.1) + sidekiq (6.4.0) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) @@ -1225,7 +1220,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (2.0.0) + ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1312,7 +1307,7 @@ GEM rugged (>= 0.27, < 1.3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.8) unicode-display_width (1.7.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) @@ -1372,7 +1367,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby @@ -1401,7 +1396,6 @@ DEPENDENCIES base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - bcrypt_pbkdf (~> 1.1) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) @@ -1434,7 +1428,6 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) - ed25519 (~> 1.2) elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) @@ -1463,14 +1456,14 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.6.0.pre.rc1) + gitaly (~> 14.8.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.6.1) - gitlab-experiment (~> 0.6.5) + gitlab-dangerfiles (~> 2.8.0) + gitlab-experiment (~> 0.7.0) gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.21.3) - gitlab-license (~> 2.0) + gitlab-labkit (~> 0.22.0) + gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) @@ -1534,7 +1527,6 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - net-ssh (~> 6.0) nokogiri (~> 1.12) oauth2 (~> 1.4) octokit (~> 4.15) @@ -1571,7 +1563,7 @@ DEPENDENCIES pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.0) - puma (~> 5.5.2) + puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) @@ -1579,7 +1571,7 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.1.4.4) + rails (~> 6.1.4.6) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1607,7 +1599,7 @@ DEPENDENCIES ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) - rubyzip (~> 2.0.0) + rubyzip (~> 2.3.2) rugged (~> 1.2) sanitize (~> 6.0) sassc-rails (~> 2.1.0) @@ -1617,7 +1609,7 @@ DEPENDENCIES sentry-raven (~> 3.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) - sidekiq (~> 6.3) + sidekiq (~> 6.4) sidekiq-cron (~> 1.2) simple_po_parser (~> 1.1.2) simplecov (~> 0.18.5) @@ -1631,7 +1623,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - sshkey (~> 2.0) + ssh_data (~> 1.2) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) 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 025378dd5d..0a2d8394e0 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 @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3ab9n901craqd3p1yl87kawci0vfw1xlh4d0zkj7lx8hpk10sn"; + sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q94js7ifm0a76xcwxin98bhr8nz0zqcsqi4y7j2mfwm3hq3bh0i"; + sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gncnc5xl1ff70mfnqcys2qy65201yjrkwxx0hb5hl7jlamgvz9h"; + sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9591z8lsp9lx3l75699prw6rgkhhlrfaj4lh5klcdffvxzkvi3"; + sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sf0nfjcj1na4v6zaxz6hjglax99yznaymjzpk1fi7mk71qf5hx4"; + sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6mmm1s8abv11ycqs6cq55kr6j89jpclkcnra9w2k47rl047vk4"; + sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -479,16 +479,6 @@ }; version = "3.1.16"; }; - bcrypt_pbkdf = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; - type = "gem"; - }; - version = "1.1.0"; - }; benchmark = { groups = ["default" "development"]; platforms = []; @@ -745,14 +735,14 @@ version = "3.0.2"; }; claide = { - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; claide-plugins = { dependencies = ["cork" "nap" "open4"]; @@ -814,10 +804,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.5"; }; contracts = { groups = ["default"]; @@ -1253,16 +1243,6 @@ }; version = "0.3.0"; }; - ed25519 = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; - type = "gem"; - }; - version = "1.2.4"; - }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1896,10 +1876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "175whfk08jrmvssh5lgk0zgsaksbnhv6p5fg3picknrw4v05vw85"; + sha256 = "0dl80qvyl1jbcc1iabpja3pnsrfag92h25c2r3vqn3bd0x9q4iwc"; type = "gem"; }; - version = "14.6.0.pre.rc1"; + version = "14.8.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1939,21 +1919,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgb0v41qn2cnzzn4fizffds07vhz9sf09bpmm0lw86x8lz6vfdq"; + sha256 = "0xd7sgl5iwxq2mvx7ql1wpciqrnj2z1ycjxm5ddrdi4kcl9f94z4"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; gitlab-experiment = { - dependencies = ["activesupport" "request_store" "scientist"]; + dependencies = ["activesupport" "request_store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "064iy0pgjfvfcxynclmk70cdi10hwx7xzq1c14p68cilg569vma2"; + sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1972,20 +1952,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fs11wpqn801dsscs845629hbgwbgs94qhig45jmalw4h9rira4"; + sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; type = "gem"; }; - version = "0.21.3"; + version = "0.22.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz"; + sha256 = "1ys98a5qwih4l9zllsysd48d7jl5qcw2ralav0hab3lxalmy5pwf"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -2487,10 +2467,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; http-form_data = { groups = ["default"]; @@ -2540,10 +2520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; i18n_data = { groups = ["default"]; @@ -3955,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; puma_worker_killer = { dependencies = ["get_process_mem" "puma"]; @@ -4093,10 +4073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10vylypjzfp6c34zx175x7ql7h27llmjdhgjxp5bn2zmrx3lac8l"; + sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4148,10 +4128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla"; + sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4335,10 +4315,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; }; regexp_property_values = { groups = ["default"]; @@ -4367,10 +4347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -4772,10 +4752,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.2"; }; rugged = { groups = ["default"]; @@ -4842,15 +4822,15 @@ version = "4.0.0"; }; sassc = { - dependencies = ["ffi" "rake"]; + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.0.1"; + version = "2.4.0"; }; sassc-rails = { dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; @@ -4874,16 +4854,6 @@ }; version = "0.8.2"; }; - scientist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05xiv6kznhawbkjrz97s6lp2ld0w95x1l2s80gm8m49f273399s2"; - type = "gem"; - }; - version = "1.6.2"; - }; sd_notify = { groups = ["puma"]; platforms = []; @@ -4994,10 +4964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k38cbwhcj9ncfzlgfmvq2zqfdvldln58w8s8v89m0jqlhnhsqhj"; + sha256 = "10pllqwracvy5nmchipg359sq9pnyg08q970xpqmpc3nkmrihxlf"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5200,15 +5170,15 @@ }; version = "1.3.13"; }; - sshkey = { + ssh_data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; type = "gem"; }; - version = "2.0.0"; + version = "1.2.0"; }; ssrf_filter = { groups = ["default"]; @@ -5645,10 +5615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -5948,9 +5918,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix index 7464dcfb73..c62b680b3f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.66"; + version = "0.67"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "13xrwndj80jix210fxkadivxyd1f5qavdrhxyl32n68xyv5xmkgg"; + sha256 = "sha256-37Ncljw2tibVRrynDlbxk7d5IS+5QypNFvKIkZ5JvME="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 80c2679d05..17d21f30e3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -20,7 +20,7 @@ let inherit (python3Packages) docutils python fb-re2 pygit2 pygments; self = python3Packages.buildPythonApplication rec { - pname = "mercurial"; + pname = "mercurial${lib.optionalString fullBuild "-full"}"; version = "6.0.3"; src = fetchurl { @@ -34,9 +34,9 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "${pname}-${version}"; + name = "mercurial-${version}"; sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; - sourceRoot = "${pname}-${version}/rust"; + sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -180,7 +180,7 @@ in buildInputs = self.buildInputs ++ self.propagatedBuildInputs; nativeBuildInputs = self.nativeBuildInputs; - phases = [ "installPhase" "installCheckPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index 9835e23f28..c3c25dafd5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.6' +gem 'rails', '5.2.6.2' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' 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 00ac026e86..b745c54520 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6) - actionpack (= 5.2.6) + actioncable (5.2.6.2) + actionpack (= 5.2.6.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailer (5.2.6.2) + actionpack (= 5.2.6.2) + actionview (= 5.2.6.2) + activejob (= 5.2.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (5.2.6.2) + actionview (= 5.2.6.2) + activesupport (= 5.2.6.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.6) - activesupport (= 5.2.6) + actionview (5.2.6.2) + activesupport (= 5.2.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (5.2.6.2) + activesupport (= 5.2.6.2) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) + activemodel (5.2.6.2) + activesupport (= 5.2.6.2) + activerecord (5.2.6.2) + activemodel (= 5.2.6.2) + activesupport (= 5.2.6.2) arel (>= 9.0) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) + activestorage (5.2.6.2) + actionpack (= 5.2.6.2) + activerecord (= 5.2.6.2) marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (5.2.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -58,21 +58,21 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (3.0.0) + childprocess (4.1.0) chunky_png (1.4.0) concurrent-ruby (1.1.9) crass (1.0.6) - css_parser (1.10.0) + css_parser (1.11.0) addressable csv (3.1.9) docile (1.4.0) erubi (1.10.0) - globalid (0.5.2) + globalid (1.0.0) activesupport (>= 5.0) htmlentities (4.3.4) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.12.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -82,7 +82,7 @@ GEM mini_magick (4.11.0) mini_mime (1.0.3) mini_portile2 (2.5.3) - minitest (5.14.4) + minitest (5.15.0) mocha (1.13.0) mysql2 (0.5.3) net-ldap (0.17.0) @@ -91,44 +91,44 @@ GEM mini_portile2 (~> 2.5.0) racc (~> 1.4) parallel (1.21.0) - parser (3.0.2.0) + parser (3.1.1.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + rails (5.2.6.2) + actioncable (= 5.2.6.2) + actionmailer (= 5.2.6.2) + actionpack (= 5.2.6.2) + actionview (= 5.2.6.2) + activejob (= 5.2.6.2) + activemodel (= 5.2.6.2) + activerecord (= 5.2.6.2) + activestorage (= 5.2.6.2) + activesupport (= 5.2.6.2) bundler (>= 1.3.0) - railties (= 5.2.6) + railties (= 5.2.6.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (5.2.6.2) + actionpack (= 5.2.6.2) + activesupport (= 5.2.6.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rbpdf (1.20.1) htmlentities @@ -136,7 +136,7 @@ GEM rbpdf-font (1.19.1) redcarpet (3.5.1) regexp_parser (1.8.2) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) roadie (4.0.0) @@ -147,7 +147,7 @@ GEM roadie (>= 3.1, < 5.0) rotp (6.2.0) rouge (3.26.1) - rqrcode (2.1.0) + rqrcode (2.1.1) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -160,8 +160,8 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -172,8 +172,9 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) simplecov (0.18.5) docile (~> 1.1) @@ -182,25 +183,27 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (2.1.0) - webdrivers (4.6.1) + webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (> 3.141, < 5.0) + webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.26) + yard (0.9.27) + webrick (~> 1.7.0) PLATFORMS ruby @@ -224,7 +227,7 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.6) + rails (= 5.2.6.2) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) 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 5a964f51e3..39e46d90b8 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 }: let - version = "4.2.3"; + version = "4.2.4"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,8 +15,10 @@ in inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj"; + # https://www.redmine.org/news/134 + # > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded." + url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz"; + sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d"; }; 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 dbbef0f218..a18e819fc9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s778lwghaf0zwfvbhzvjq691rl75d85raiqg1c7zly8p9afq8ym"; + sha256 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvn4lrkhqmxp96npjp4sfaz78h9ab2lrl20sjph7xxakfwknld"; + sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; + sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; + sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cdvxkbzbs4cdh4bgf2cg7i886a20gvr43hg76kx5rzd8xal7xnd"; + sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; + sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; + sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wnzac1qs4y339p13xyr03rx4ql3i4ywzfhyzn118d2zz82xnpfl"; + sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; + sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -166,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; type = "gem"; }; - version = "3.0.0"; + version = "4.1.0"; }; chunky_png = { groups = ["default"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; csv = { groups = ["default"]; @@ -248,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; type = "gem"; }; - version = "0.5.2"; + version = "1.0.0"; }; htmlentities = { groups = ["default"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.12.0"; + version = "2.14.0"; }; mail = { dependencies = ["mini_mime"]; @@ -351,10 +351,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; type = "gem"; }; - version = "5.14.4"; + version = "5.15.0"; }; mocha = { groups = ["test"]; @@ -431,10 +431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; type = "gem"; }; - version = "3.0.2.0"; + version = "3.1.1.0"; }; pg = { groups = ["default"]; @@ -470,20 +470,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; racc = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rack = { groups = ["default" "openid" "test"]; @@ -523,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p17dmifd0v3knh9wja4z4rv0qaybwansnwxmvx6f3rcgkszkpnc"; + sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,20 +556,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; + sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; rainbow = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default"]; @@ -628,10 +628,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; rexml = { groups = ["default" "test"]; @@ -691,10 +691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc"; + sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rqrcode_core = { groups = ["default"]; @@ -723,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59"; + sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; type = "gem"; }; - version = "1.12.0"; + version = "1.16.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -781,15 +781,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; + dependencies = ["childprocess" "rexml" "rubyzip"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; + sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7"; type = "gem"; }; - version = "3.142.7"; + version = "4.1.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -829,20 +829,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thread_safe = { groups = ["default" "test"]; @@ -881,10 +881,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; + sha256 = "05fdb6z8541p912xanjbl9y15cyj6g44530y0nib6qhv6i90rkzp"; type = "gem"; }; - version = "4.6.1"; + version = "4.7.0"; + }; + webrick = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -919,13 +929,14 @@ version = "3.2.0"; }; yard = { + dependencies = ["webrick"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; type = "gem"; }; - version = "0.9.26"; + version = "0.9.27"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix index 3c0e540d22..4c14704956 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix @@ -65,23 +65,19 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "smartgit"; desktopName = "SmartGit"; - categories = concatStringsSep ";" [ + categories = [ "Application" "Development" "RevisionControl" ]; - mimeType = concatStringsSep ";" [ + mimeTypes = [ "x-scheme-handler/git" "x-scheme-handler/smartgit" "x-scheme-handler/sourcetree" ]; - startupNotify = "true"; - extraEntries = '' - Keywords=git - StartupWMClass=${name} - Version=1.0 - Encoding=UTF-8 - ''; + startupNotify = true; + startupWMClass = name; + keywords = [ "git" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix index 4f09fc14d9..0e97eab177 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -12,7 +12,7 @@ , desktop-file-utils , makeWrapper , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook4 , meson , gjs , gtk4 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info # for update-mime-database - wrapGAppsHook # for gsettings + wrapGAppsHook4 # for gsettings ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 2bd30c9e52..9a1940cffc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { desktopName = "ClipGrab"; comment = meta.description; genericName = "Web video downloader"; - categories = "Qt;AudioVideo;Audio;Video"; + categories = [ "Qt" "AudioVideo" "Audio" "Video" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix b/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix index 9faa83c64f..5c2fbe66f0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix @@ -13,7 +13,7 @@ let inherit pname version; attrPath = lib.toLower pname; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater); diff --git a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix index 28a974a7cc..add2e525dc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.6"; + version = "1.22.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY="; + sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix index 93f11e78ff..d80384f7b2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook , zlib, libzen, libmediainfo, curl, libmms, glib }: @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o="; + url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE="; }; unpackPhase = "tar xvf $src"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} # Expose the binary in bin to make runnable. ln -s $out/opt/filebot.sh $out/bin/filebot ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix index 6597b5fbff..6fd7a2036c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "2.0.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5"; + sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mirakurun/update.nix b/third_party/nixpkgs/pkgs/applications/video/mirakurun/update.nix index ccea227978..18a4d0ab25 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mirakurun/update.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mirakurun/update.nix @@ -17,7 +17,7 @@ let # exclude prerelease versions versionLister = writers.writeBash "list-mirakurun-versions" '' - ${common-updater-scripts}/bin/list-git-tags ${homepage} \ + ${common-updater-scripts}/bin/list-git-tags --url=${homepage} \ | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 6d3f9b6d32..22c206dfe0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.2.0"; + version = "27.2.1"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "KZgwAtyxv2vXDW7vF1eArF5Mqw45NngwChc+5OnXuXg="; + sha256 = "sha256-RHPzSw7wjnAHk90N7g53LyIH3ozO/hyZV5hVZpZe+Ow="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch b/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch new file mode 100644 index 0000000000..f3b31ed958 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch @@ -0,0 +1,139 @@ +From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001 +From: ckie +Date: Tue, 8 Feb 2022 19:18:49 +0200 +Subject: [PATCH] remove printer support + +--- + app/src/CMakeLists.txt | 4 ++-- + guilib/src/CMakeLists.txt | 4 ++-- + guilib/src/GraphViewer.cpp | 12 +----------- + guilib/src/ImageView.cpp | 16 ---------------- + guilib/src/utilite/UPlot.cpp | 9 --------- + 5 files changed, 5 insertions(+), 40 deletions(-) + +diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt +index b20a07d4..2cad8c1e 100644 +--- a/app/src/CMakeLists.txt ++++ b/app/src/CMakeLists.txt +@@ -63,9 +63,9 @@ ENDIF() + TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt +index 3711205b..a393aa25 100644 +--- a/guilib/src/CMakeLists.txt ++++ b/guilib/src/CMakeLists.txt +@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES}) + TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp +index 58907c34..7b41061f 100644 +--- a/guilib/src/GraphViewer.cpp ++++ b/guilib/src/GraphViewer.cpp +@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #ifdef QT_SVG_LIB + #include +@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event) + this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents + QSize sceneSize = this->scene()->sceneRect().size().toSize(); + +- if(QFileInfo(filePath).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( filePath ); +- QPainter p(&printer); +- scene()->render(&p); +- p.end(); +- } +- else if(QFileInfo(filePath).suffix().compare("svg") == 0) ++ if(QFileInfo(filePath).suffix().compare("svg") == 0) + { + #ifdef QT_SVG_LIB + QSvgGenerator svgGen; +diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp +index 714f2d36..887e7bdc 100644 +--- a/guilib/src/ImageView.cpp ++++ b/guilib/src/ImageView.cpp +@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #include "rtabmap/utilite/ULogger.h" + #include "rtabmap/gui/KeypointItem.h" +@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e) + } + + _savedFileName = text; +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( text ); +- QPainter p(&printer); +- p.begin(&printer); +- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width()); +- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height()); +- double scale = qMin(xscale, yscale); +- p.scale(scale, scale); +- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect()); +- p.end(); +- } +- else + { + QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied); + QPainter p(&img); +diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp +index 1b11c65e..8bf94841 100644 +--- a/guilib/src/utilite/UPlot.cpp ++++ b/guilib/src/utilite/UPlot.cpp +@@ -42,7 +42,6 @@ + #include + #include + #include +-#include + #include + #include + #ifdef QT_SVG_LIB +@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event) + else + { + #endif +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer; +- printer.setOutputFormat(QPrinter::PdfFormat); +- printer.setOutputFileName(text); +- this->render(&printer); +- } +- else + { + QPixmap figure = QPixmap::grabWidget(this); + figure.save(text); +-- +2.34.1 + diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix new file mode 100644 index 0000000000..c6429b0934 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen +, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect +, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "rtabmap"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "introlab"; + repo = "rtabmap"; + rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2"; + sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40="; + }; + + patches = [ + # Our Qt5 seems to be missing PrintSupport.. I think? + ./0001-remove-printer-support.patch + ]; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; + buildInputs = [ + ## Required + opencv + pcl + ## Optional + libusb1 + eigen + g2o + ceres-solver + # libpointmatcher - ABI mismatch + octomap + freenect + libdc1394 + # librealsense - missing includedir + qtbase + libGL + libGLU + vtkWithQt5 + ]; + + # Disable warnings that are irrelevant to us as packagers + cmakeFlags = "-Wno-dev"; + + # We run one of the executables we build while the build is + # still running (and patchelf hasn't been invoked) which means + # the RPATH is not set correctly. This hacks around that error: + # + # build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory + LD_LIBRARY_PATH = "/build/source/build/bin"; + + meta = with lib; { + description = "Real-Time Appearance-Based 3D Mapping"; + homepage = "https://introlab.github.io/rtabmap/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 3b6116d5a0..e996ae92d2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -17,8 +17,7 @@ , qtgraphicaleffects , qmake , qttools -, genericUpdater -, common-updater-scripts +, gitUpdater }: assert lib.versionAtLeast mlt.version "6.24.0"; @@ -76,9 +75,8 @@ mkDerivation rec { cp -r src/qml $out/share/shotcut/ ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 53e87fbb2b..911373c58e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; - categories = "AudioVideo;Network;"; + categories = [ "AudioVideo" "Network" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index aa4a9000d2..281f1f2461 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-0Fbmtb7Ec6WcA7ARtgdBK5i7yAq2t3iXtfLb/MZcKJA="; + sha256 = "sha256-NOFDUOypq/1ePM8rdK2cDnH1LsSZJ7eQOzDc5h4/PvY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 4a2ec178be..07e0cb6c53 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -18,6 +18,7 @@ let disabledTests = [ "test_capabilities.py" "test_cwd.py" + "test_delete.py" "test_detach.py" "test_exec.py" "test_hooks.py" @@ -37,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI="; + sha256 = "sha256-5q8HirGOPsbaJ7JoLa4DRYkZX3kucWOZ633nzx4zVhg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix new file mode 100644 index 0000000000..8e9ea890a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix @@ -0,0 +1,38 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "distrobox"; + version = "1.2.13"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = pname; + rev = version; + sha256 = "047mrhsfi88mgwylnnyxg6xa7hjjrajn2pf7vfmb6161myqybvfy"; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ./install -p $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Wrapper around podman or docker to create and start containers"; + longDescription = '' + Use any linux distribution inside your terminal. Enable both backward and + forward compatibility with software and freedom to use whatever distribution + you’re more comfortable with + ''; + homepage = "https://distrobox.privatedns.org/"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix index a3ef59e8e9..c2769a0ccf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.25.2"; + version = "1.0.0"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-ZzlPq+Q9XfWQJr+7nKS0e6bfKwYNfpMHSiBIKeOr/s4="; + x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix index bd92f7666a..9c9da54c36 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix @@ -2,38 +2,52 @@ , stdenv , fetchurl , glib +, gnome , librest , libsoup , pkg-config +, gobject-introspection }: -with lib; - stdenv.mkDerivation rec { pname = "libgovirt"; version = "0.3.8"; - src = fetchurl { - url = "https://download.gnome.org/sources/libgovirt/0.3/${pname}-${version}.tar.xz"; - sha256 = "sha256-HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; - }; + outputs = [ "out" "dev" ]; - enableParallelBuilding = true; + src = fetchurl { + url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + }; nativeBuildInputs = [ pkg-config + gobject-introspection ]; - propagatedBuildInputs = [ - librest + buildInputs = [ libsoup ]; - meta = { + propagatedBuildInputs = [ + glib + librest + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; description = "GObject wrapper for the oVirt REST API"; maintainers = [ maintainers.amarshall ]; platforms = platforms.linux; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 5d2be06db0..60db570892 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]; postUnpack = '' echo ${src.rev} > source/VERSION diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 0dad4d9123..7d783b211b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -17,20 +17,20 @@ buildGoModule rec { pname = "podman"; - version = "3.4.4"; + version = "4.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-5Y0+xfoMCe3a6kX+OhmxURZXZLAnrS1t8TFyHqjGCeA="; + sha256 = "sha256-uLpvTnn2EWEI8+5gC3ofMjsZ9O7nLOaaUGGuvSE1gdE="; }; vendorSha256 = null; doCheck = false; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; @@ -47,26 +47,32 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - ${if stdenv.isDarwin - then "make podman-remote" - else "make podman"} + ${if stdenv.isDarwin then '' + make podman-remote # podman-mac-helper uses FHS paths + '' else '' + make bin/podman bin/rootlessport + ''} make docs runHook postBuild ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' - mv bin/{darwin/podman,podman} - '' + '' - install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/* - installShellCompletion --fish completions/fish/* - installShellCompletion --zsh completions/zsh/* - MANDIR=$man/share/man make install.man-nobuild - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system + mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper + ${if stdenv.isDarwin then '' + mv bin/{darwin/podman,podman} + '' else '' + install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d + install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d + for s in contrib/systemd/**/*.in; do + substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary + done + PREFIX=$out make install.systemd + install -Dm555 bin/rootlessport -t $rootlessport/bin + ''} + install -Dm555 bin/podman -t $out/bin + PREFIX=$out make install.completions + MANDIR=$man/share/man make install.man runHook postInstall ''; @@ -87,9 +93,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; - changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; + changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593d..fa3a50bc53 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -1,7 +1,9 @@ { podman-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -13,12 +15,19 @@ , cni-plugins # not added to path , iptables , iproute2 +, catatonit +, gvproxy }: +# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + +# adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests + let podman = podman-unwrapped; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -29,6 +38,18 @@ let iproute2 ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${podman.pname}-helper-binary-wrapper-${podman.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + podman.rootlessport + ]; + }; + in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version passthru; @@ -54,5 +75,6 @@ in runCommand podman.name { ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index ee923f4e0c..2c2094763c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, runtimeShell +, makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -175,6 +175,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ + remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do @@ -219,6 +220,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' + ln -s $out/libexec/virtiofsd $out/bin ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; @@ -239,5 +241,6 @@ stdenv.mkDerivation rec { mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; + priority = 10; # Prefer virtiofsd from the virtiofsd package. }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix index af2c4939ad..c6442b57a4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, acpica-tools, python3 }: +{ lib, stdenv, fetchgit, acpica-tools, python3 }: stdenv.mkDerivation rec { pname = "seabios"; - version = "1.15.0"; + version = "1.16.0"; - src = fetchurl { - url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-YownF8mUMmtFMlFXPRBZ4qOhEtSqSIds4nyz8d4ZiPg="; + src = fetchgit { + url = "https://git.seabios.org/seabios.git"; + rev = "rel-${version}"; + sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; }; nativeBuildInputs = [ python3 ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix index 23aa8ff820..e7cc1a477c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Berry Window Manager"; genericName = "Berry Window Manager"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix index 4647f0a072..f3c2e13fbd 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.5"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a"; + sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; 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 da04da4e9e..cdcfcca15e 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.21.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0maPT1NdWFkSupU6CL2cFd6hlZ2BMxAOK6f3rQbfFA8="; + sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so="; }; - cargoSha256 = "sha256-QUecTmw8pWqrTdcstbXoFf53dFfwFN51tQ7ngUzkyV0="; + cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix new file mode 100644 index 0000000000..31101721e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/swallow.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, poetry-core +, i3ipc +, xlib +, six +}: + +buildPythonApplication rec { + pname = "i3-swallow"; + version = "unstable-2022-02-19"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jamesofarrell"; + repo = "i3-swallow"; + rev = "6fbc04645c483fe733de56b56743e453693d4c78"; + sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + i3ipc + xlib + six + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/jamesofarrell/i3-swallow"; + description = "Swallow a terminal window in i3wm"; + license = licenses.mit; + platforms = platforms.linux; + mainProgram = "swallow"; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix index 2c9461d638..8a9b72265b 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/jwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; + sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM="; }; nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 0051961d9f..1c4e2b6076 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -41,7 +41,7 @@ let basePkgs = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) bashInteractive coreutils less shadow su + (toString gcc.cc.lib) bashInteractiveFHS coreutils less shadow su gawk diffutils findutils gnused gnugrep gnutar gzip bzip2 xz ]; diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix index 44c8adb06e..abf577baa2 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix @@ -45,7 +45,7 @@ let basePkgs = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) bashInteractive coreutils less shadow su + (toString gcc.cc.lib) bashInteractiveFHS coreutils less shadow su gawk diffutils findutils gnused gnugrep gnutar gzip bzip2 xz ]; diff --git a/third_party/nixpkgs/pkgs/build-support/coq/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/default.nix index 569b07cded..a681bbda55 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/default.nix @@ -16,6 +16,7 @@ in displayVersion ? {}, release ? {}, extraBuildInputs ? [], + extraNativeBuildInputs ? [], namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], @@ -34,7 +35,7 @@ let args-to-remove = foldl (flip remove) ([ "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" - "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" + "release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix" "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; @@ -67,9 +68,11 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; - buildInputs = [ coq ] - ++ optionals mlPlugin coq.ocamlBuildInputs + nativeBuildInputs = [ coq ] ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2] + ++ optionals mlPlugin coq.ocamlNativeBuildInputs + ++ extraNativeBuildInputs; + buildInputs = optionals mlPlugin coq.ocamlBuildInputs ++ extraBuildInputs; inherit enableParallelBuilding; diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 49a61f4e5d..e3762327a1 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }: +{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert }: { name ? "${args.pname}-${args.version}" +, pname ? name , enableParallelBuilding ? true , doCheck ? false # Flags to pass to `makeWrapper`. This is done to avoid double wrapping. @@ -19,6 +20,8 @@ # Flags to pass to dotnet in all phases. , dotnetFlags ? [] +# The path to publish the project to. When unset, the directory "$out/lib/$pname" is used. +, installPath ? null # The binaries that should get installed to `$out/bin`, relative to `$out/lib/$pname/`. These get wrapped accordingly. # Unfortunately, dotnet has no method for doing this automatically. # If unset, all executables in the projects root will get installed. This may cause bloat! @@ -67,204 +70,75 @@ assert projectFile == null -> throw "Defining the `projectFile` attribute is req assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; let - _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - }); + inherit (callPackage ./hooks { + inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; + }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; + + _nugetDeps = mkNugetDeps { name = "${name}-nuget-deps"; nugetDeps = import nugetDeps; }; _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences; - nuget-source = stdenvNoCC.mkDerivation rec { + nuget-source = mkNugetSource { name = "${args.pname}-nuget-source"; - meta.description = "A Nuget source with the dependencies for ${args.pname}"; - - nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; - buildCommand = '' - export HOME=$(mktemp -d) - mkdir -p $out/{lib,share} - - nuget sources Add -Name nixos -Source "$out/lib" - nuget init "${_nugetDeps}" "$out/lib" - ${lib.optionalString (projectReferences != []) - "nuget init \"${_localDeps}\" \"$out/lib\""} - - # Generates a list of all unique licenses' spdx ids. - find "$out/lib" -name "*.nuspec" -exec sh -c \ - "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses - ''; - } // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. - meta.licence = let - depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); - getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); - in (lib.flatten (lib.forEach depLicenses (spdx: - if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx - ))); + description = "A Nuget source with the dependencies for ${args.pname}"; + deps = [ _nugetDeps _localDeps ]; }; - package = stdenvNoCC.mkDerivation (args // { - inherit buildType; +in stdenvNoCC.mkDerivation (args // { + nativeBuildInputs = args.nativeBuildInputs or [] ++ [ + dotnetConfigureHook + dotnetBuildHook + dotnetCheckHook + dotnetInstallHook + dotnetFixupHook - nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk cacert makeWrapper ]; + dotnet-sdk + cacert + makeWrapper + ]; - # Stripping breaks the executable - dontStrip = true; + # Stripping breaks the executable + dontStrip = args.dontStrip or true; - # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping - dontWrapGApps = true; + # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping + dontWrapGApps = args.dontWrapGApps or true; - DOTNET_NOLOGO = true; # This disables the welcome message. - DOTNET_CLI_TELEMETRY_OPTOUT = true; + DOTNET_NOLOGO = args.DOTNET_NOLOGO or true; # This disables the welcome message. + DOTNET_CLI_TELEMETRY_OPTOUT = args.DOTNET_CLI_TELEMETRY_OPTOUT or true; - passthru = { - fetch-deps = writeScript "fetch-${args.pname}-deps" '' - set -euo pipefail - cd "$(dirname "''${BASH_SOURCE[0]}")" - - export HOME=$(mktemp -d) - deps_file="/tmp/${args.pname}-deps.nix" - - store_src="${package.src}" - src="$(mktemp -d /tmp/${args.pname}.XXX)" - cp -rT "$store_src" "$src" - chmod -R +w "$src" - - trap "rm -rf $src $HOME" EXIT - pushd "$src" - - export DOTNET_NOLOGO=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - mkdir -p "$HOME/nuget_pkgs" - - for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do - ${dotnet-sdk}/bin/dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$HOME/nuget_pkgs" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - echo "Writing lockfile..." - ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" - echo "Succesfully wrote lockfile to: $deps_file" - ''; - } // args.passthru or {}; - - configurePhase = args.configurePhase or '' - runHook preConfigure + passthru = { + fetch-deps = writeScript "fetch-${pname}-deps" '' + set -euo pipefail + cd "$(dirname "''${BASH_SOURCE[0]}")" export HOME=$(mktemp -d) + deps_file="/tmp/${pname}-deps.nix" - for project in ''${projectFile[@]} ''${testProjectFile[@]}; do - dotnet restore "$project" \ + store_src="${args.src}" + src="$(mktemp -d /tmp/${pname}.XXX)" + cp -rT "$store_src" "$src" + chmod -R +w "$src" + + trap "rm -rf $src $HOME" EXIT + pushd "$src" + + export DOTNET_NOLOGO=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + + mkdir -p "$HOME/nuget_pkgs" + + for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do + ${dotnet-sdk}/bin/dotnet restore "$project" \ ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --source "${nuget-source}/lib" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" + --packages "$HOME/nuget_pkgs" \ + ${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \ + ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} done - runHook postConfigure + echo "Writing lockfile..." + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + echo "Succesfully wrote lockfile to: $deps_file" ''; - - buildPhase = args.buildPhase or '' - runHook preBuild - - for project in ''${projectFile[@]} ''${testProjectFile[@]}; do - dotnet build "$project" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:Version=${args.version} \ - --configuration "$buildType" \ - --no-restore \ - "''${dotnetBuildFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - runHook postBuild - ''; - - checkPhase = args.checkPhase or '' - runHook preCheck - - for project in ''${testProjectFile[@]}; do - ${lib.getBin dotnet-test-sdk}/bin/dotnet test "$project" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --configuration "$buildType" \ - --no-build \ - --logger "console;verbosity=normal" \ - ${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "&FullyQualifiedName!=" disabledTests}\""} \ - "''${dotnetTestFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - runHook postCheck - ''; - - installPhase = args.installPhase or '' - runHook preInstall - - for project in ''${projectFile[@]}; do - dotnet publish "$project" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output $out/lib/${args.pname} \ - --configuration "$buildType" \ - --no-build \ - --no-self-contained \ - "''${dotnetInstallFlags[@]}" \ - "''${dotnetFlags[@]}" - done - '' + lib.optionalString packNupkg '' - for project in ''${projectFile[@]}; do - dotnet pack "$project" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output $out/share \ - --configuration "$buildType" \ - --no-build \ - "''${dotnetPackFlags[@]}" \ - "''${dotnetFlags[@]}" - done - '' + '' - runHook postInstall - ''; - - preFixup = '' - _wrapDotnetProgram() { - makeWrapper "$1" "$out/bin/$(basename "$executable")" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ - "''${gappsWrapperArgs[@]}" \ - "''${makeWrapperArgs[@]}" - } - '' + (if executables != null then '' - for executable in ''${executables[@]}; do - execPath="$out/lib/${args.pname}/$executable" - - if [[ -f "$execPath" && -x "$execPath" ]]; then - _wrapDotnetProgram $execPath - else - echo "Specified binary \"$executable\" is either not an executable, or does not exist!" - exit 1 - fi - done - '' else '' - for executable in $out/lib/${args.pname}/*; do - if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then - _wrapDotnetProgram $executable - fi - done - ''); - }); -in - package + } // args.passthru or {}; +}) diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix new file mode 100644 index 0000000000..76f7eea5bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -0,0 +1,62 @@ +{ lib +, callPackage +, makeSetupHook +, makeWrapper +, dotnet-sdk +, dotnet-test-sdk +, disabledTests +, nuget-source +, dotnet-runtime +, runtimeDeps +, buildType +}: + +{ + dotnetConfigureHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-configure-hook"; + deps = [ dotnet-sdk nuget-source ]; + substitutions = { + nugetSource = nuget-source; + }; + } ./dotnet-configure-hook.sh) { }; + + dotnetBuildHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-build-hook"; + deps = [ dotnet-sdk ]; + substitutions = { + inherit buildType; + }; + } ./dotnet-build-hook.sh) { }; + + dotnetCheckHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-check-hook"; + deps = [ dotnet-test-sdk ]; + substitutions = { + inherit buildType; + disabledTests = lib.optionalString (disabledTests != []) + (lib.concatStringsSep "&FullyQualifiedName!=" disabledTests); + }; + } ./dotnet-check-hook.sh) { }; + + dotnetInstallHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-install-hook"; + deps = [ dotnet-sdk ]; + substitutions = { + inherit buildType; + }; + } ./dotnet-install-hook.sh) { }; + + dotnetFixupHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-fixup-hook"; + deps = [ dotnet-runtime makeWrapper ]; + substitutions = { + dotnetRuntime = dotnet-runtime; + runtimeDeps = lib.makeLibraryPath runtimeDeps; + }; + } ./dotnet-fixup-hook.sh) { }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh new file mode 100644 index 0000000000..a1dc80a77f --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -0,0 +1,41 @@ +declare -a projectFile testProjectFile dotnetBuildFlags dotnetFlags + +dotnetBuildHook() { + echo "Executing dotnetBuildHook" + + runHook preBuild + + if [ "${enableParallelBuilding-}" ]; then + maxCpuFlag="$NIX_BUILD_CORES" + parallelBuildFlag="true" + else + maxCpuFlag="1" + parallelBuildFlag="false" + fi + + if [ "${version-}" ]; then + versionFlag="-p:Version=${version-}" + fi + + for project in ${projectFile[@]} ${testProjectFile[@]}; do + env \ + dotnet build "$project" \ + -maxcpucount:$maxCpuFlag \ + -p:BuildInParallel=$parallelBuildFlag \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "@buildType@" \ + --no-restore \ + ${versionFlag-} \ + "${dotnetBuildFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postBuild + + echo "Finished dotnetBuildHook" +} + +if [[ -z "${dontDotnetBuild-}" && -z "${buildPhase-}" ]]; then + buildPhase=dotnetBuildHook +fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh new file mode 100644 index 0000000000..e3098908fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -0,0 +1,33 @@ +declare -a testProjectFile dotnetTestFlags dotnetFlags + +dotnetCheckHook() { + echo "Executing dotnetCheckHook" + + runHook preCheck + + if [ "${disabledTests-}" ]; then + disabledTestsFlag="--filter FullyQualifiedName!=@disabledTests@" + fi + + for project in ${testProjectFile[@]}; do + env \ + dotnet test "$project" \ + -maxcpucount:$maxCpuFlag \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "@buildType@" \ + --no-build \ + --logger "console;verbosity=normal" \ + ${disabledTestsFlag-} \ + "${dotnetTestFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postCheck + + echo "Finished dotnetCheckHook" +} + +if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then + checkPhase=dotnetCheckHook +fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh new file mode 100644 index 0000000000..3ca89fdc09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -0,0 +1,32 @@ +declare -a projectFile testProjectFile dotnetRestoreFlags dotnetFlags + +dotnetConfigureHook() { + echo "Executing dotnetConfigureHook" + + runHook preConfigure + + if [ -z "${enableParallelBuilding-}" ]; then + parallelFlag="--disable-parallel" + fi + + export HOME=$(mktemp -d) + + for project in ${projectFile[@]} ${testProjectFile[@]}; do + env \ + dotnet restore "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "@nugetSource@/lib" \ + ${parallelFlag-} \ + "${dotnetRestoreFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postConfigure + + echo "Finished dotnetConfigureHook" +} + +if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then + configurePhase=dotnetConfigureHook +fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh new file mode 100644 index 0000000000..f8bbb7b180 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -0,0 +1,42 @@ +declare -a makeWrapperArgs gappsWrapperArgs + +# First argument is the executable you want to wrap, +# the second is the destination for the wrapper. +wrapDotnetProgram() { + makeWrapper "$1" "$2" \ + --set "DOTNET_ROOT" "@dotnetRuntime@" \ + --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \ + "${gappsWrapperArgs[@]}" \ + "${makeWrapperArgs[@]}" + + echo "Installed wrapper to: "$2"" +} + +dotnetFixupHook() { + echo "Executing dotnetFixupPhase" + + if [ "${executables-}" ]; then + for executable in ${executables[@]}; do + execPath="$out/lib/${pname-}/$executable" + + if [[ -f "$execPath" && -x "$execPath" ]]; then + wrapDotnetProgram "$execPath" "$out/bin/$(basename "$executable")" + else + echo "Specified binary \"$executable\" is either not an executable, or does not exist!" + exit 1 + fi + done + else + for executable in $out/lib/${pname-}/*; do + if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then + wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")" + fi + done + fi + + echo "Finished dotnetFixupPhase" +} + +if [[ -z "${dontDotnetFixup-}" ]]; then + preFixupPhases+=" dotnetFixupHook" +fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh new file mode 100644 index 0000000000..ed2c9160cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -0,0 +1,42 @@ +declare -a projectFile dotnetInstallFlags dotnetFlags + +dotnetInstallHook() { + echo "Executing dotnetInstallHook" + + runHook preInstall + + for project in ${projectFile[@]}; do + env \ + dotnet publish "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output "$out/lib/${pname}" \ + --configuration "@buildType@" \ + --no-build \ + --no-self-contained \ + "${dotnetInstallFlags[@]}" \ + "${dotnetFlags[@]}" + done + + if [[ "${packNupkg-}" ]]; then + for project in ${projectFile[@]}; do + env \ + dotnet pack "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output "$out/share" \ + --configuration "@buildType@" \ + --no-build \ + "${dotnetPackFlags[@]}" \ + "${dotnetFlags[@]}" + done + fi + + runHook postInstall + + echo "Finished dotnetInstallHook" +} + +if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then + installPhase=dotnetInstallHook +fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-deps/default.nix new file mode 100644 index 0000000000..75178d5b77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -0,0 +1,9 @@ +{ linkFarmFromDrvs, fetchurl }: +{ name, nugetDeps }: + linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { + fetchNuGet = { pname, version, sha256 }: fetchurl { + name = "${pname}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; + inherit sha256; + }; + }) diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix new file mode 100644 index 0000000000..0690a05aa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -0,0 +1,30 @@ +{ dotnetPackages, lib, xml2, stdenvNoCC }: +{ name, description ? "", deps ? [] }: +let + _nuget-source = stdenvNoCC.mkDerivation rec { + inherit name; + meta.description = description; + + nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; + buildCommand = '' + export HOME=$(mktemp -d) + mkdir -p $out/{lib,share} + + nuget sources Add -Name nixos -Source "$out/lib" + ${ lib.concatMapStringsSep "\n" (dep: + ''nuget init "${dep}" "$out/lib"'' + ) deps } + + # Generates a list of all unique licenses' spdx ids. + find "$out/lib" -name "*.nuspec" -exec sh -c \ + "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses + ''; +} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. + meta.licence = let + depLicenses = lib.splitString "\n" (builtins.readFile "${_nuget-source}/share/licenses"); + getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); + in (lib.flatten (lib.forEach depLicenses (spdx: + if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx + ))); +}; +in _nuget-source diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix index 72af03e03d..776089dab9 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix @@ -95,6 +95,9 @@ in # Doing the download on a remote machine just duplicates network # traffic, so don't do that by default , preferLocalBuild ? true + + # Additional packages needed as part of a fetch +, nativeBuildInputs ? [ ] }: assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; @@ -128,7 +131,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; - nativeBuildInputs = [ curl ]; + nativeBuildInputs = [ curl ] ++ nativeBuildInputs; urls = urls_; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix index af38537737..a3f22de58c 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -13,6 +13,7 @@ , urls ? [] , extraPostFetch ? "" , name ? "source" +, nativeBuildInputs ? [ ] , # Allows to set the extension for the intermediate downloaded # file. This can be used as a hint for the unpackCmdHooks to select # an appropriate unpacking tool. @@ -31,6 +32,8 @@ in { downloadToTemp = true; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; + postFetch = '' unpackDir="$TMPDIR/unpack" @@ -64,7 +67,4 @@ in { + '' chmod 755 "$out" ''; -} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: { - # Hackety-hack: we actually need unzip hooks, too - nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; -}) +} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" "nativeBuildInputs" ])) diff --git a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix index 5208dbc7d0..691b2c5c6e 100644 --- a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix @@ -63,6 +63,9 @@ let nukeReferences ]; + # avoid pub phase + dontBuild = true; + installPhase = '' . ${../fetchgit/deterministic-git} @@ -76,6 +79,7 @@ let flutter config --enable-linux-desktop flutter packages get flutter build linux || true # so it downloads tools + ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} RES="$TMP" @@ -127,6 +131,7 @@ let ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" @@ -207,6 +212,7 @@ let # ensure we're using a lockfile for the right package version if [ -e pubspec.lock ]; then + # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. # diff -u pubspec.lock $depsFolder/pubspec.lock true else @@ -248,9 +254,10 @@ let mkdir -p $out/bin mv $built $out/app - for f in $built/data/flutter_assets/assets/*.desktop; do + for f in $(find $out/app -iname "*.desktop" -type f); do install -D $f $out/share/applications/$(basename $f) done + for f in $(find $out/app -maxdepth 1 -type f); do ln -s $f $out/bin/$(basename $f) done diff --git a/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix index 63ef7e6550..d21e0475e2 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -4,33 +4,34 @@ let pListText = lib.generators.toPlist { } { CFBundleDevelopmentRegion = "English"; CFBundleExecutable = "$name"; - CFBundleIconFiles = [ "$iconPlistArray" ]; + CFBundleIconFile = "$icon"; CFBundleIdentifier = "org.nixos.$name"; CFBundleInfoDictionaryVersion = "6.0"; CFBundleName = "$name"; CFBundlePackageType = "APPL"; CFBundleSignature = "???"; }; - -# The generation of the CFBundleIconFiles array is a bit of a hack, since we -# will always end up with an empty first element () but macOS -# appears to ignore this which allows us to use the nix PList generator. in writeScriptBin "write-darwin-bundle" '' shopt -s nullglob - readonly prefix="$1" - readonly name="$2" - readonly exec="$3" - iconPlistArray="" + readonly prefix=$1 + readonly name=$2 + readonly exec=$3 + readonly icon=$4.icns + readonly squircle=''${5:-1} + readonly plist=$prefix/Applications/$name.app/Contents/Info.plist - for icon in "$prefix/Applications/$name.app/Contents/Resources"/*; do - iconPlistArray="$iconPlistArray"$(basename "$icon")"" - done - - cat > "$prefix/Applications/$name.app/Contents/Info.plist" < "$plist" <$icon|$icon| + " -i "$plist" + fi + cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <.*,\1,p') - -# print available versions -for tag in $tags1; do - tags2=$(curl -sS "$archive/$tag/") - tags2=$(echo "$tags2" | sed -rne "s,^.*,\\1,p") - echo "$tags2" -done diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/list-archive-two-levels-versions b/third_party/nixpkgs/pkgs/common-updater/scripts/list-archive-two-levels-versions new file mode 100755 index 0000000000..4263a9de3c --- /dev/null +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +# lists all available versions listed for a package in a site (http) + +archive="" # archive url +pname="" # package name +file="" # file for writing debugging information + +while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + archive="${flag#*=}" + ;; + --pname=*) + pname="${flag#*=}" + ;; + --file=*) + file="${flag#*=}" + ;; + *) + echo "$0: unknown option ‘${flag}’" + exit 1 + ;; + esac +done + +# by default set url to the base dir of the first url in src.urls +if [[ -z "$archive" ]]; then + archive="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \ + | tr -d '"')" +fi + +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_ATTR_PATH" +fi + +# print a debugging message +if [[ -n "$file" ]]; then + echo "# Listing versions for '$pname' at $archive" >> $file +fi + +# list all major-minor versions from archive +tags1=$(curl -sS "$archive/") +tags1=$(echo "$tags1" | sed -rne 's,^.*,\1,p') + +# print available versions +for tag in $tags1; do + tags2=$(curl -sS "$archive/$tag/") + tags2=$(echo "$tags2" | sed -rne "s,^.*,\\1,p") + echo "$tags2" +done diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags b/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags index d137552cdd..176e647eb2 100755 --- a/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/list-git-tags @@ -2,29 +2,50 @@ # lists all available tags from a git repository -scriptName=list-git-tags # do not use the .wrapped name +echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt -usage() { - echo "Usage: $scriptName [ []]" -} +url="" # git repository url +pname="" # package name +file="" # file for writing debugging information -repo="$1" # git repository url -pname="$2" # package name -file="$3" # file for writing debugging information +while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + url="${flag#*=}" + ;; + --pname=*) + pname="${flag#*=}" + ;; + --file=*) + file="${flag#*=}" + ;; + *) + echo "$0: unknown option ‘${flag}’" + exit 1 + ;; + esac +done -if [ -z "$repo" ]; then - echo "$scriptName: Missing git repository url" - usage - exit 1 +# By default we set url to src.url or src.meta.homepage +if [[ -z "$url" ]]; then + url="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ + | tr -d '"')" +fi + +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_ATTR_PATH" fi # print a debugging message -if [ -n "$file" ]; then - echo "# Listing tags for $pname at $repo" >> $file +if [[ -n "$file" ]]; then + echo "# Listing tags for '$pname' at $url" >> $file fi # list all tags from the remote repository -tags=$(git ls-remote --tags --refs "$repo") +tags=$(git ls-remote --tags --refs "$url") # keep only the version part of the tag tags=$(echo "$tags" | cut --delimiter=/ --field=3) diff --git a/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix index ed4389cad6..1a9d9a87ab 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/execline-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "execline-man-pages"; - version = "2.8.1.0.3"; - sha256 = "1n7c75lmyrjzzcbwjl6fxhfs4k29qlr66r1q35799h942cn4li7v"; + version = "2.8.1.0.4"; + sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd"; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix index db4d05a91b..7d407bade4 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/s6-man-pages/default.nix @@ -2,7 +2,7 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.0.0.5"; + version = "2.11.0.1.1"; sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6"; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; diff --git a/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix index 769f34348b..502aab98ca 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-networking-man-pages"; - version = "2.5.0.0.2"; - sha256 = "1ix8qrivp9prw0m401d7s9vkxhw16a4sxfhrs7abf9qqhs2zkd1r"; + version = "2.5.1.0.1"; + sha256 = "1h87s3wixsms8ys7gvm1s9d8pzn73q5j4sgybpi3gmr55d4cwra4"; description = "Port of the documentation for the s6-networking suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix index 39ef6e34aa..d2ecda3a11 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix @@ -1,20 +1,31 @@ -{ lib, fetchurl }: +{ lib, fetchurl, stdenv }: let pname = "agave"; - version = "35"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; + version = "37"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf + mkAg = name: hash: fetchurl { + url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf"; + sha256 = hash; + name = "Agave-${name}.ttf"; + }; + # There are slashed variants, but with same name so only bundle the default versions for now: + fonts = [ + (mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=") + (mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=") + ]; + +in stdenv.mkDerivation { + inherit pname version; + srcs = fonts; + sourceRoot = "."; + + dontUnpack = true; + + installPhase = '' + install -D $srcs -t $out/share/fonts/truetype/ ''; - sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; - meta = with lib; { description = "truetype monospaced typeface designed for X environments"; homepage = "https://b.agaric.net/page/agave"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix b/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix index aaa380098a..02ee29a382 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; + sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; meta = with lib; { homepage = "https://software.sil.org/andika"; 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 75f1d89be7..3294cb7110 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08="; + sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix index a1e686a320..f720c2cac7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "doulos-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o="; + sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; meta = with lib; { homepage = "https://software.sil.org/doulos"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix index ac8839f075..f64f7b3414 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "gentium-${version}"; @@ -23,7 +23,7 @@ in fetchzip rec { -d $out/share/doc/${name}/documentation ''; - sha256 = "sha256-DeoMTJ2nhTBtNQYG55lIMvnulqpk/KTeIqgpb5eiTIA="; + sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh index 208ea6101a..8d91805898 100755 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh @@ -8,7 +8,7 @@ repo=https://github.com/be5invis/Iosevka # Discover the latest version. current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') -new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') if [[ "$new_version" == "$current_version" ]]; then echo "iosevka: no update found" exit diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix new file mode 100644 index 0000000000..0d328e0a8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchzip }: + +let version = "1.210"; in +fetchzip { + name = "lxgw-wenkai-${version}"; + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; + + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + sha256 = "n8vnkoOJuUO4Gh+GUInZ/HJK5t4pD7MrPPaxDyH+0Qw="; + + meta = with lib; { + homepage = "https://lxgw.github.io/"; + description = "An open-source Chinese font derived from Fontworks' Klee One"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ elliot ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix index 93ff513c89..a3d273bb8a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "parastoo-fonts"; - version = "1.0.0-alpha5"; + version = "2.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; ''; - sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4"; + sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix b/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix index 37ca9db9fa..9daaffd0b4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - version = "2.3.2"; + version = "4.0.2"; in fetchFromGitHub { name = "redhat-official-${version}"; @@ -11,11 +11,13 @@ fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype OTF/*.otf - install -m444 -Dt $out/share/fonts/truetype TTF/*.ttf + for kind in mono proportional; do + install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf + install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf + done ''; - sha256 = "1afvxmgif61hb17g8inmxvq30vkzwh30mydlqpf0zgvaaz8qdwmv"; + sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; 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 3d601bdc68..efd58b348d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.35.8"; + version = "0.36.0"; in fetchurl { name = "sarasa-gothic-${version}"; # 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"; - sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0="; + sha256 = "sha256-ENBF7dVFp9lrGGRwNIB0Yg7y1F5XbVivgD2e9pLZQwQ="; recursiveHash = true; downloadToTemp = true; diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index f6ac136d4a..99c31edd2f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd"; + sha256 = "sha256-ZUSG9lui07ICG/4M6LBEAhJo9KuKd+wMb2VoKu5Ifmg="; }; nativeBuildInputs = [ 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 79ca07dd5b..2a5d60898b 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 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.02.06"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-a+h5DMxVM1TPVx8yuKwRzjjnBLnIWMCCKG+BPg1Hq5Y="; + sha256 = "sha256-adSoFKvemirQtxoS6KrQvXxtIOKFZ73PTktVXytblbM="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 550b11c7ac..d335911c24 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.02.06"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-dKBNB1udRysDe3HbUh2qudQDeLgS/wmSnY3nAWnmjQo="; + sha256 = "sha256-VCXHInaxn5BKY9Yth6DjoKa/JS2WVjvwAfRMiL2r1B0="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 9da7178e80..9b0a2537f6 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220204"; + version = "20220302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-DYz2fnn1ZfX09NQcRXmGTYY95K5wOWhlmJeDjEvN1vY="; + sha256 = "sha256-X92an2jGRgZ/Q3cr6Q729DA2hs/2y34HoRpB1rxk0hI="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix index ab7742bb36..56491fe444 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2022-01-25"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-XKNSCWwanm2dP002TY/mE4SDX13TllHrbrb55V4wLSQ="; + sha256 = "sha256-tnhu//q0Vl7MiMeHopB1Gwokkw/P+nDOo4HKizjxC0Y="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index c7a1ef2755..4af6f3b4db 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: +{ lib +, stdenv +, fetchurl +, osinfo-db-tools +, gettext +, libxml2 +}: stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20211216"; + version = "20220214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-CeznsOUhMw4x0SpZFx408JcYGny7zW+M1J+SiSO7EII="; + sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k="; }; - nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; + nativeBuildInputs = [ + osinfo-db-tools + gettext + libxml2 + ]; installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" @@ -18,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; + changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index f7f5f64bfd..525e96de8e 100644 --- a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,28 +2,45 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "0r88j00shmhayfq8avswaxsaj1my1vq540rg0srma29862vrjpfk"; + hash = "sha256-FPN9EIwXtz0b1tUZ/AOWK2zj2nfd5+POGmRC52mSzcA="; }; + # List of file formats to package. + _types = [ "html" "json" "jsonld" "rdfa" "rdfnt" "rdfturtle" "rdfxml" "template" "text" ]; + + outputs = [ "out" ] ++ _types; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - install -vDt $out/json json/licenses.json + mkdir -pv $out + for t in $_types + do + _outpath=''${!t} + mkdir -pv $_outpath + cp -ar $t $_outpath && echo "$t format installed" + done runHook postInstall ''; + dontFixup = true; + meta = with lib; { description = "Various data formats for the SPDX License List"; homepage = "https://github.com/spdx/license-list-data"; license = licenses.cc0; - maintainers = with maintainers; [ oxzi ]; + maintainers = with maintainers; [ oxzi c0bw3b ]; platforms = platforms.all; }; } 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 df190fd9ef..1216369166 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 = "202202170030"; + version = "202203020509"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c"; - sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk="; + rev = "9dce4df2c1f409bad67f579910a4edf522251e7b"; + sha256 = "sha256-fR0lzvVQjWA3KbzLhuvoB15Z+7RAv34Wf5W7KRZ//QA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix new file mode 100644 index 0000000000..3b44b71213 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "ydp-grand"; + version = "unstable-2016-08-04"; + + src = fetchurl { + url = "https://freepats.zenvoid.org/Piano/YDP-GrandPiano/YDP-GrandPiano-SF2-20160804.tar.bz2"; + sha256 = "sha256-0kPcPhgqYN8qFukoKMGCHPPrV0i0Xi4r3Pqc968FYCY="; + }; + + installPhase = '' + install -Dm644 YDP-GrandPiano-*.sf2 $out/share/soundfonts/YDP-GrandPiano.sf2 + ''; + + meta = with lib; { + description = "Acoustic grand piano soundfont"; + homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html"; + license = licenses.cc-by-30; + platforms = platforms.all; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix index 38702fe409..59b2714285 100644 --- a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20220118"; + version = "20220215"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-FG/SQdMracnP9zlb6LtPAsATvKeX0WaWPwjbrR1ZNZM="; + sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 966cb1c4f6..1e9f9041ca 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita"; - version = "12.1"; + version = "13.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "04im7va5xpi17yjkrc46m5bm9j55qq66br1xg8a2arm0j4i0bqsk"; + sha256 = "sha256-aP/zPM7M8Oru/2AA8w6rKU/AVJJ0bAEC01C60yi2SbM="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; diff --git a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix index a2a518d3f0..d250de15ca 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -7,70 +7,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2022-01-08"; + version = "unstable-2022-02-26"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86"; - sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc="; + rev = "0da58e462e8ba6c71245d13fbddac950b72018ae"; + sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "46c9e6665963ccb54938d7730e520bd8c52f4307"; - sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI="; + rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519"; + sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "da5c930386427fce65ea185f164709c8a20e362f"; - sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0="; + rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb"; + sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7"; - sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss="; + rev = "4e69cf6e1798938ab7c5795940c663d866ce8201"; + sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "259e30ce13566214c7594b038dd2c240648a07a0"; - sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM="; + rev = "866629583187b914725f05683125fde7f6c280f1"; + sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30"; - sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k="; + rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b"; + sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f"; - sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk="; + rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5"; + sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06"; - sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU="; + rev = "72cbd567212b21ea20769fe244c148f799435536"; + sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc="; name = "Nordic-Polar-standard-buttons"; }) ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index 666166e0a9..ccaee7f655 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2021-12-13"; + version = "2022-02-18"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-PN2ucGMDzRv4v86X1zVIs9+GkbMWuja2WaSQLFvJYd0="; + sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix index 6833f47366..825772880d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -4,25 +4,47 @@ , glib , gnome-shell , gnome-themes-extra +, jdupes , libxml2 , sassc , util-linux +, altVariants ? [] # default: normal +, colorVariants ? [] # default: all +, opacityVariants ? [] # default: all +, themeVariants ? [] # default: default (BigSur-like theme) +, nautilusSize ? null # default: 200px +, panelOpacity ? null # default: 15% +, panelSize ? null # default: 32px }: +let + pname = "whitesur-gtk-theme"; + single = x: lib.optional (x != null) x; + +in +lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) +lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) +lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize) + stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-12-28"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc"; + sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc"; }; nativeBuildInputs = [ glib gnome-shell + jdupes libxml2 sassc util-linux @@ -48,8 +70,21 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes - ./install.sh --dest $out/share/themes --alt all --theme all + + ./install.sh \ + ${toString (map (x: "--alt " + x) altVariants)} \ + ${toString (map (x: "--color " + x) colorVariants)} \ + ${toString (map (x: "--opacity " + x) opacityVariants)} \ + ${toString (map (x: "--theme " + x) themeVariants)} \ + ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ + ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ + ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ + --dest $out/share/themes + + jdupes --link-soft --recurse $out/share + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix index 147c36cbda..9864e1c0e1 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-rAPc4RF2uXp1hI8/8PXDYy3DnL5vNR8rF/EEixO0FXI="; + sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index 74987c07a5..28406e4128 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -44,6 +44,7 @@ , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps , withPantheon ? false +, withLibsecret ? true }: stdenv.mkDerivation rec { @@ -103,13 +104,14 @@ stdenv.mkDerivation rec { libarchive libhandy librsvg - libsecret libspectre libxml2 pango poppler t1lib texlive.bin.core # kpathsea for DVI support + ] ++ lib.optionals withLibsecret [ + libsecret ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportMultimedia (with gst_all_1; [ @@ -126,6 +128,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dnautilus=false" "-Dps=enabled" + ] ++ lib.optionals (!withLibsecret) [ + "-Dkeyring=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix index 7440749e0a..c496ceee6e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; + hash = "sha256-rYYS110B7qY8WcmY65KOvm75mEZgYbn8H97IKF02M5g="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix index 2b36373e2b..9e02b80d9f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix @@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; { gitg = callPackage ./misc/gitg { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; @@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 + bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25 geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25 @@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25 gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21 gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25 - libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14 + libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14 libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25 rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25 networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 1f540ab603..d0df663424 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "21"; + version = "23"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-A47nX2fmFcJfWvQUJZsFGK1h4GPkf3QBB0BALlr9ZlM="; + sha256 = "sha256-i/sXAZhNbbVbKdCJ3k9kRAEY9iC5iSNq4YtjiiOqHTM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index c78a59af52..9447de1fd4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "71+date=2022-01-24"; + version = "71+date=2022-02-23"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; - rev = "53114b4e000482a753e8b42dfa10d6057c08d1c6"; - sha256 = "Gv78I/dxhc6FpjZWk10uHBfD24tHE4KdkpaAo8UZpwU="; + rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f"; + sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index cb527ecce3..2c43c1402a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -93,7 +93,7 @@ , {"uuid": "dejadup-backup@fthx", "name": "Déjà Dup Backup Button", "pname": "deja-dup-backup-button", "description": "Button that directly starts Déjà Dup backup, following Déjà Dup backup settings.\n\n It simply runs 'deja-dup --backup' and shows Déjà Dup window during backup.", "link": "https://extensions.gnome.org/extension/955/deja-dup-backup-button/", "shell_version_map": {"38": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "ISS_Above@mcepl.cepl.eu", "name": "ISS Above", "pname": "iss-above", "description": "Shows an icon when ISS is above you (+- 1000km)", "link": "https://extensions.gnome.org/extension/956/iss-above/", "shell_version_map": {"40": {"version": "4", "sha256": "00r5clklx8wbwdqyniz1lxf864jk71q7j36icq6jkp65v8av5cjn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIGljb24gd2hlbiBJU1MgaXMgYWJvdmUgeW91ICgrLSAxMDAwa20pIiwKICAibmFtZSI6ICJJU1MgQWJvdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWNlcGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUlTU19BYm92ZS8iLAogICJ1dWlkIjogIklTU19BYm92ZUBtY2VwbC5jZXBsLmV1IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "switcher@landau.fi", "name": "Switcher", "pname": "switcher", "description": "Switch windows or launch applications quickly by typing\n\nUse the configured global hotkey (Super+w by default) to open a list of current windows. Type a part of the name or title of the application window you want to activate and hit enter or click on the item you wish to activate. You can use the arrow keys to navigate among the filtered selection and type several space separated search terms to filter further. If your search matches launchable apps, those are shown in the list too. Use Esc or click anywhere outside the switcher to cancel.\n\nYou can customize the look and feel and functionality in the preferences.", "link": "https://extensions.gnome.org/extension/973/switcher/", "shell_version_map": {"38": {"version": "32", "sha256": "188bfj4b0kslja757fc70xhjqj5blk2jcdjfd2pvm6g2cxslfjg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWVsbGFuZGF1L3N3aXRjaGVyIiwKICAidXVpZCI6ICJzd2l0Y2hlckBsYW5kYXUuZmkiLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "33", "sha256": "1dk91bvmjqr4hrsldb6ikvrd6ihk5flbg8wfhfnmq4c18kynsv9i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "34", "sha256": "1bgj8w7qlz4kv70k6rjmm5f5rygn2n5fp0rd29jj1wfm50hfvzg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM0Cn0="}}} -, {"uuid": "keyboard_modifiers_status@sneetsher", "name": "Keyboard Modifiers Status", "pname": "keyboard-modifiers-status", "description": "Shows keyboard modifiers status. It's useful when sticky keys are active.", "link": "https://extensions.gnome.org/extension/975/keyboard-modifiers-status/", "shell_version_map": {"38": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"uuid": "keyboard_modifiers_status@sneetsher", "name": "Keyboard Modifiers Status", "pname": "keyboard-modifiers-status", "description": "Shows keyboard modifiers status. It's useful when sticky keys are active.", "link": "https://extensions.gnome.org/extension/975/keyboard-modifiers-status/", "shell_version_map": {"38": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change led size", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {"38": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "syncthingicon@jay.strict@posteo.de", "name": "Syncthing Icon", "pname": "syncthing-icon", "description": "Display Syncthing Icon in Top Bar", "link": "https://extensions.gnome.org/extension/989/syncthing-icon/", "shell_version_map": {"40": {"version": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"uuid": "window-search-provider@quelltexter.org", "name": "Window Search Provider", "pname": "window-search-provider", "description": "Provide active windows as search results in overview", "link": "https://extensions.gnome.org/extension/1001/window-search-provider/", "shell_version_map": {"38": {"version": "2", "sha256": "030s38akm3fw7nq9v4wfgzhw716b51l2z3szns0gcwc0gx5zpfjv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYWN0aXZlIHdpbmRvd3MgYXMgc2VhcmNoIHJlc3VsdHMgaW4gb3ZlcnZpZXciLAogICJuYW1lIjogIldpbmRvdyBTZWFyY2ggUHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjMuNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rbG9yZW56L2dub21lLXNoZWxsLXdpbmRvdy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogIndpbmRvdy1zZWFyY2gtcHJvdmlkZXJAcXVlbGx0ZXh0ZXIub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -118,7 +118,7 @@ , {"uuid": "add-username-toppanel@brendaw.com", "name": "Add Username to Top Panel", "pname": "add-username-to-top-panel", "description": "Simply add your username to topbar panel aggregate menu", "link": "https://extensions.gnome.org/extension/1108/add-username-to-top-panel/", "shell_version_map": {"38": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "Hide_Clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides the Gnome title bar clock. \nThis is useful for anyone recording their desktop as it allows you to edit the video without the titlebar clock jumping time.\nNow supports Gnome 40.", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "gnome-shell-screenshot@ttll.de", "name": "Screenshot Tool", "pname": "screenshot-tool", "description": "Conveniently create, copy, store and upload screenshots. Please log out and log in again after updating.", "link": "https://extensions.gnome.org/extension/1112/screenshot-tool/", "shell_version_map": {"38": {"version": "56", "sha256": "1ga2ray64aq1d1vn0rsscfxjiidbiln3vx42rn9i4q2a59b00znq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY1NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNTYKfQ=="}, "40": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "41": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}}} -, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "10", "sha256": "0jn8qd2x25bw2kmz82z4szgx1vm838zkq0wv18jw82bpf7b597k0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0jn8qd2x25bw2kmz82z4szgx1vm838zkq0wv18jw82bpf7b597k0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "When switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {"38": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "ibus-font-setting@ibus.github.com", "name": "ibus font setting", "pname": "ibus-font-setting", "description": "use ibus font setting of ibus setup dialog to enhance the user experience", "link": "https://extensions.gnome.org/extension/1121/ibus-font-setting/", "shell_version_map": {"38": {"version": "9", "sha256": "163byvsc3dj2w9xq498py1xjziyi98icyki1cd6wv7vxaxfmk7y6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "github.notifications@alexandre.dufournet.gmail.com", "name": "Github Notifications", "pname": "github-notifications", "description": "Integrate Github's notifications within the gnome desktop environment\nSource code is available here: https://github.com/alexduf/gnome-github-notifications", "link": "https://extensions.gnome.org/extension/1125/github-notifications/", "shell_version_map": {"38": {"version": "17", "sha256": "0ccgbllyak1lyp14ynsg17zngfpxkc5v5asv3zwwmpk44bl984ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "21", "sha256": "1j5ndicq5jgvf78lxrb2afbpfs10yc3ncc4v1dz1iqnv9kmhk132", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImdpdGh1Yi5ub3RpZmljYXRpb25zQGFsZXhhbmRyZS5kdWZvdXJuZXQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "21", "sha256": "1j5ndicq5jgvf78lxrb2afbpfs10yc3ncc4v1dz1iqnv9kmhk132", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImdpdGh1Yi5ub3RpZmljYXRpb25zQGFsZXhhbmRyZS5kdWZvdXJuZXQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}}} @@ -139,7 +139,7 @@ , {"uuid": "SystemMenu@jonnius.github.com", "name": "System Menu", "pname": "system-menu", "description": "System menu with usefull shortcuts", "link": "https://extensions.gnome.org/extension/1204/system-menu/", "shell_version_map": {"38": {"version": "5", "sha256": "10zfr3fhqvq0fxqjzqmnxmhmdw5xcw9m5k3jm1apcjqnm38r896w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtZW51IHdpdGggdXNlZnVsbCBzaG9ydGN1dHMiLAogICJuYW1lIjogIlN5c3RlbSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlN5c3RlbU1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2pvbm5pdXMvZ25vbWUtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogIlN5c3RlbU1lbnVAam9ubml1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "undecorate@sun.wxg@gmail.com", "name": "Undecorate Window", "pname": "undecorate", "description": "Add undecorate item in window menu. Use ALT+Space to show window menu.", "link": "https://extensions.gnome.org/extension/1208/undecorate/", "shell_version_map": {"40": {"version": "5", "sha256": "1vmpzk2vwyi5lywfzcpd350h3p09p9l5bkg7bza6b1w904lfd51n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1vmpzk2vwyi5lywfzcpd350h3p09p9l5bkg7bza6b1w904lfd51n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "rcd@criztovyl.space", "name": "Right Click Down", "pname": "right-click-down", "description": "Moves windows one workspace down by right-clicking them in the overview.", "link": "https://extensions.gnome.org/extension/1210/right-click-down/", "shell_version_map": {"38": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers\nRequired package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "15p3h8ac2qjpa3il34zrq5nk2q0xgdcd953976isx6g0hrdzdrcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "14", "sha256": "1shawbwmbmq4girjcd40116h5xa137xxdc26ixj9pbam4lzj5m6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "17", "sha256": "1rwfxk1cqzp13daz7ypps06bsgjk7jzd5y353abqhqfrvg4q4px1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} +, {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers. Required package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "1q2k5b4z159nfr5mn4ah8fz9x8dq35x5sz99s8yhalbkb0ba0d1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "18", "sha256": "0ymwfkcb7d20lv5wvsqsbh1n5c6cn90iy8g49fnmaja8gm5wazd6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "0ymwfkcb7d20lv5wvsqsbh1n5c6cn90iy8g49fnmaja8gm5wazd6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "move-osd-windows@maestroschan.fr", "name": "Move OSD Windows", "pname": "move-osd-windows", "description": "Change the position of OSD windows (sound & luminosity popups).", "link": "https://extensions.gnome.org/extension/1220/move-osd-windows/", "shell_version_map": {"38": {"version": "3", "sha256": "1nmvbx7qbr9a9al5wirnsfwn4qb1qbql2w9f7fpajipasill9hkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgcG9zaXRpb24gb2YgT1NEIHdpbmRvd3MgKHNvdW5kICYgbHVtaW5vc2l0eSBwb3B1cHMpLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1vdmUtb3NkLXdpbmRvd3MiLAogICJuYW1lIjogIk1vdmUgT1NEIFdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWVzdHJvc2NoYW4vTW92ZS1PU0QtV2luZG93cy1HTk9NRS1FeHRlbnNpb24iLAogICJ1dWlkIjogIm1vdmUtb3NkLXdpbmRvd3NAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "arc-menu@linxgem33.com", "name": "Arc Menu", "pname": "arc-menu", "description": "## UNMAINTAINED ##\n\nThe original version of Arc Menu and all attached repositories apart from the disaster recovery branch will no longer receive updates or further development.\n\nKind Regards - LinxGem33 (Andy C)", "link": "https://extensions.gnome.org/extension/1228/arc-menu/", "shell_version_map": {"38": {"version": "49", "sha256": "0x1kr339qarkviinf13s6ih01ssdh321nw8ncnnrq7ihqpzysf8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIFVOTUFJTlRBSU5FRCAjI1xuXG5UaGUgb3JpZ2luYWwgdmVyc2lvbiBvZiBBcmMgTWVudSBhbmQgYWxsIGF0dGFjaGVkIHJlcG9zaXRvcmllcyBhcGFydCBmcm9tIHRoZSBkaXNhc3RlciByZWNvdmVyeSBicmFuY2ggd2lsbCBubyBsb25nZXIgcmVjZWl2ZSB1cGRhdGVzIG9yIGZ1cnRoZXIgZGV2ZWxvcG1lbnQuXG5cbktpbmQgUmVnYXJkcyAtIExpbnhHZW0zMyAoQW5keSBDKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyYy1tZW51IiwKICAibmFtZSI6ICJBcmMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0xpbnhHZW0zMy9BcmMtTWVudSIsCiAgInV1aWQiOiAiYXJjLW1lbnVAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}}} , {"uuid": "GmailMessageTray@shuming0207.gmail.com", "name": "Gnome Email Notifications", "pname": "gmail-message-tray", "description": "Shows Gmail and Outlook notifications in Gnome Message Tray using Gnome Online Accounts\n", "link": "https://extensions.gnome.org/extension/1230/gmail-message-tray/", "shell_version_map": {"40": {"version": "22", "sha256": "1hsjqhm0gb7iisg3drwyav166w8zvbfbsdwr47v997xf4mfaycbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "24", "sha256": "0vldilmp2vzfl99fw0ainnlj9sz0a95zjlqnzybsz7dasin39i9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}}} @@ -147,7 +147,7 @@ , {"uuid": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Disable the “Window is ready” notification.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {"38": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {"38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "timepp@zagortenay333", "name": "Time ++", "pname": "time", "description": "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarm clock", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": {"38": {"version": "155", "sha256": "1v71hlwrw9kbxfvka5w8cfqmvcjw3k9xjdwhwlk4i4q5k6kgjih3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRyYW5zbGF0aW9uc191cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZS90cmVlL21hc3Rlci9kYXRhL3BvX2ZpbGVzIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"}, "40": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}, "41": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}}} -, {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "23", "sha256": "1vvxhzj6khbcp5bf4yvlwk21hlfqxp5vmzsfjyfs736pnbnplfif", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "1vvxhzj6khbcp5bf4yvlwk21hlfqxp5vmzsfjyfs736pnbnplfif", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1vvxhzj6khbcp5bf4yvlwk21hlfqxp5vmzsfjyfs736pnbnplfif", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} , {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Lightweight GNOME shell extension to set your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nThis extension is based extensively on the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nFeatures:\n* Fetches Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Optionally force a specific region (i.e. locale)\n* UHD supported resolutions\n* Only attempts to download wallpapers when they have been updated\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n *NEW: random mode\n *NEW: select wallpaper from previously downloaded images\n* English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portuguese (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Finnish (fi_FI) - a HUGE thanks to the translators\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}, "40": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}, "41": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"uuid": "gnomesome@chwick.github.com", "name": "Gnomesome", "pname": "gnomesome", "description": "Tiling window manager with awesome keybindings", "link": "https://extensions.gnome.org/extension/1268/gnomesome/", "shell_version_map": {"38": {"version": "15", "sha256": "1dn67is3qk80xxfkc2pd43jrsyylmsprd7v3axvl677wdjgaq83z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGF3ZXNvbWUga2V5YmluZGluZ3MiLAogICJuYW1lIjogIkdub21lc29tZSIsCiAgInNldHRpbmdzLWtleWJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lc29tZS5rZXliaW5kaW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nod2ljay9nbm9tZXNvbWUiLAogICJ1dWlkIjogImdub21lc29tZUBjaHdpY2suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "gnome-vagrant-indicator@gnome-shell-exstensions.fffilo.github.com", "name": "GNOME Vagrant Indicator", "pname": "gnome-vagrant-indicator", "description": "Easily manage your vagrant machines from status area", "link": "https://extensions.gnome.org/extension/1269/gnome-vagrant-indicator/", "shell_version_map": {"40": {"version": "14", "sha256": "194kfjbv8wc4krxcdazm03c0rnzz11n5xa0m11zq3nczw9pasvwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmZmlsby9nbm9tZS12YWdyYW50LWluZGljYXRvciIsCiAgInV1aWQiOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXhzdGVuc2lvbnMuZmZmaWxvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} @@ -170,7 +170,7 @@ , {"uuid": "notes@maestroschan.fr", "name": "Notes", "pname": "notes", "description": "Sticky notes for the GNOME Shell desktop.", "link": "https://extensions.gnome.org/extension/1357/notes/", "shell_version_map": {"38": {"version": "22", "sha256": "0svx60711cphswiigd1sswczk17cjxr7gr3davk4krkhya04llp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"uuid": "slinger@gfxmonk.net", "name": "slinger", "pname": "slinger", "description": "Sling windows around efficiently", "link": "https://extensions.gnome.org/extension/1372/slinger/", "shell_version_map": {"40": {"version": "7", "sha256": "1hpzcslqln0yz4kv216z8qqq9639sh1awp6q8c33d7jp11ydwhlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW1iZXJ0c29uL3NsaW5nZXIiLAogICJ1dWlkIjogInNsaW5nZXJAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "unix-timestamp-clock@se1exin.github.com", "name": "Unix Timestamp Clock", "pname": "unix-timestamp-clock", "description": "Show the current unix timestamp as a clock in the top bar.\n\nCopy-paste currently shown timestamp (left mouse button) or current timestamp (any other mouse button) to clipboard", "link": "https://extensions.gnome.org/extension/1375/unix-timestamp-clock/", "shell_version_map": {"38": {"version": "5", "sha256": "11awssml3n1kza1inny4j89bkmgpldzcglwa26pyr432i4la0jh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGN1cnJlbnQgdW5peCB0aW1lc3RhbXAgYXMgYSBjbG9jayBpbiB0aGUgdG9wIGJhci5cblxuQ29weS1wYXN0ZSBjdXJyZW50bHkgc2hvd24gdGltZXN0YW1wIChsZWZ0IG1vdXNlIGJ1dHRvbikgb3IgY3VycmVudCB0aW1lc3RhbXAgKGFueSBvdGhlciBtb3VzZSBidXR0b24pIHRvIGNsaXBib2FyZCIsCiAgIm5hbWUiOiAiVW5peCBUaW1lc3RhbXAgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZTFleGluL3VuaXgtdGltZXN0YW1wLWNsb2NrIiwKICAidXVpZCI6ICJ1bml4LXRpbWVzdGFtcC1jbG9ja0BzZTFleGluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "11awssml3n1kza1inny4j89bkmgpldzcglwa26pyr432i4la0jh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGN1cnJlbnQgdW5peCB0aW1lc3RhbXAgYXMgYSBjbG9jayBpbiB0aGUgdG9wIGJhci5cblxuQ29weS1wYXN0ZSBjdXJyZW50bHkgc2hvd24gdGltZXN0YW1wIChsZWZ0IG1vdXNlIGJ1dHRvbikgb3IgY3VycmVudCB0aW1lc3RhbXAgKGFueSBvdGhlciBtb3VzZSBidXR0b24pIHRvIGNsaXBib2FyZCIsCiAgIm5hbWUiOiAiVW5peCBUaW1lc3RhbXAgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZTFleGluL3VuaXgtdGltZXN0YW1wLWNsb2NrIiwKICAidXVpZCI6ICJ1bml4LXRpbWVzdGFtcC1jbG9ja0BzZTFleGluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "mprisindicatorbutton@JasonLG1979.github.io", "name": "Mpris Indicator Button", "pname": "mpris-indicator-button", "description": "A full featured MPRIS indicator.", "link": "https://extensions.gnome.org/extension/1379/mpris-indicator-button/", "shell_version_map": {"38": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} +, {"uuid": "mprisindicatorbutton@JasonLG1979.github.io", "name": "Mpris Indicator Button", "pname": "mpris-indicator-button", "description": "A full featured MPRIS indicator.", "link": "https://extensions.gnome.org/extension/1379/mpris-indicator-button/", "shell_version_map": {"38": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "40": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "weatherintheclock@JasonLG1979.github.io", "name": "Weather In The Clock", "pname": "weather-in-the-clock", "description": "Display the current Weather in the Clock. GNOME Weather is required for this extension to function.", "link": "https://extensions.gnome.org/extension/1380/weather-in-the-clock/", "shell_version_map": {"38": {"version": "7", "sha256": "02aszdk2iswlqwkwi83gi69qzw0jwhill66qacrc7gg59mpfpq3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBpbiB0aGUgQ2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uLiIsCiAgIm5hbWUiOiAiV2VhdGhlciBJbiBUaGUgQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLWluLXRoZS1jbG9jay8iLAogICJ1dWlkIjogIndlYXRoZXJpbnRoZWNsb2NrQEphc29uTEcxOTc5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "02aszdk2iswlqwkwi83gi69qzw0jwhill66qacrc7gg59mpfpq3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBpbiB0aGUgQ2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uLiIsCiAgIm5hbWUiOiAiV2VhdGhlciBJbiBUaGUgQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLWluLXRoZS1jbG9jay8iLAogICJ1dWlkIjogIndlYXRoZXJpbnRoZWNsb2NrQEphc29uTEcxOTc5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "LyricsFinder@alireza6677.gmail.com", "name": "Lyrics Finder", "pname": "lyrics-finder", "description": "Finding lyrics has never been easier\nJust play some music!\n\nIf you want to report a bug please don't forget to mention:\n- Gnome shell version\n- Your Linux distro\n- Extension version\n- Error messages (If you see any)\n", "link": "https://extensions.gnome.org/extension/1383/lyrics-finder/", "shell_version_map": {"40": {"version": "14", "sha256": "1x9d3npil0wgf44p276dslw5adw4gziij03r0jlw174yy87mn2lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbmRpbmcgbHlyaWNzIGhhcyBuZXZlciBiZWVuIGVhc2llclxuSnVzdCBwbGF5IHNvbWUgbXVzaWMhXG5cbklmIHlvdSB3YW50IHRvIHJlcG9ydCBhIGJ1ZyBwbGVhc2UgZG9uJ3QgZm9yZ2V0IHRvIG1lbnRpb246XG4tIEdub21lIHNoZWxsIHZlcnNpb25cbi0gWW91ciBMaW51eCBkaXN0cm9cbi0gRXh0ZW5zaW9uIHZlcnNpb25cbi0gRXJyb3IgbWVzc2FnZXMgKElmIHlvdSBzZWUgYW55KVxuIiwKICAibmFtZSI6ICJMeXJpY3MgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmx5cmljcy1maW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL1RoZVdlaXJkRGV2L2x5cmljcy1maW5kZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJMeXJpY3NGaW5kZXJAYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "NotificationCounter@coolllsk", "name": "Notification Counter", "pname": "notification-counter", "description": "Shows number of notifications in queue.", "link": "https://extensions.gnome.org/extension/1386/notification-counter/", "shell_version_map": {"40": {"version": "4", "sha256": "0lld50jlnqgrm66030s6djy1gs5wd29l5l2is6mwqzxm8kypxpx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmtyaXphbi9Ob3RpZmljYXRpb25Db3VudGVyIiwKICAidXVpZCI6ICJOb3RpZmljYXRpb25Db3VudGVyQGNvb2xsbHNrIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -189,7 +189,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": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "7", "sha256": "09nhn8f7d8c1kp8hgw49y0d9165ckvgn6my339k0pzga02d277a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Shows a mini preview of another window (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: 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": "0nf2jxd9kvw7nzb992730xidg7kf4iywy8yr5mj9152bi2nmblz6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"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": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}}} +, {"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": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "40": {"version": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "41": {"version": "48", "sha256": "0nqnvs7zxglwhnrxac6ndjbcxgy7a5kcyyx16y5qpwk7x09y0fwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}}} , {"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": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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"}}} @@ -200,17 +200,17 @@ , {"uuid": "wsmatrix@martin.zurowietz.de", "name": "Workspace Matrix", "pname": "workspace-matrix", "description": "Arrange workspaces in a two dimensional grid with workspace thumbnails.", "link": "https://extensions.gnome.org/extension/1485/workspace-matrix/", "shell_version_map": {"38": {"version": "27", "sha256": "0b76x0li5a8x42l67ykbw34k4cfmbxqvz36zighhfw4qmxsc36cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLXdzbWF0cml4IiwKICAidXVpZCI6ICJ3c21hdHJpeEBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "containers@royg", "name": "Containers", "pname": "containers", "description": "Manage podman containers through a gnome-shell menu", "link": "https://extensions.gnome.org/extension/1500/containers/", "shell_version_map": {"40": {"version": "19", "sha256": "16z5978jwpf6cbasnfdi5w8s9dx929r8yh7a4dsrd5isnrnyi22x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "16z5978jwpf6cbasnfdi5w8s9dx929r8yh7a4dsrd5isnrnyi22x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} -, {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": {"38": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": {"38": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "tray-icons@zhangkaizhao.com", "name": "Tray Icons", "pname": "tray-icons", "description": "Tray icons", "link": "https://extensions.gnome.org/extension/1503/tray-icons/", "shell_version_map": {"38": {"version": "6", "sha256": "0q5kk8yp7cg61d4hcimrxrghsq7v8qaxjbmzvkj5apbg4cmz3s7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgaWNvbnMiLAogICJuYW1lIjogIlRyYXkgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5na2Fpemhhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJheS1pY29ucyIsCiAgInV1aWQiOiAidHJheS1pY29uc0B6aGFuZ2thaXpoYW8uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0q5kk8yp7cg61d4hcimrxrghsq7v8qaxjbmzvkj5apbg4cmz3s7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgaWNvbnMiLAogICJuYW1lIjogIlRyYXkgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5na2Fpemhhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJheS1pY29ucyIsCiAgInV1aWQiOiAidHJheS1pY29uc0B6aGFuZ2thaXpoYW8uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "new-mail-indicator@fthx", "name": "New Mail Indicator", "pname": "new-mail-indicator", "description": "An icon beside the date in the topbar to show if there are unread emails when running your default email client.\n\n It checks the notifications in the message tray related to a new mail, no extra configuration needed, very light extension. Click on the icon does toggle your email client window.*** Do not disable the notifications of your default email client! *** It is not a standalone mail checker, you need your email client to be running. *** Please check that the xdg-utils package is installed.\n\n Email clients verified at the moment are: Thunderbird, Evolution, Geary, Mailspring. Please ask to add the client, including special packaging (snap/flatpak), that you need. If you report an error, please provide at least the distribution and the email client you use through the GitHub link.\n\n For persistent notifications only, see: https://extensions.gnome.org/extension/3951/persistent-email-notifications .", "link": "https://extensions.gnome.org/extension/1505/new-mail-indicator/", "shell_version_map": {"38": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "drop-down-terminal-x@bigbn.pro", "name": "Drop Down Terminal X", "pname": "drop-down-terminal-x", "description": "THIS EXTENSION IS NO LONGER SUPPORTED.\n\nIf you are looking for an alternative please look at that https://extensions.gnome.org/extension/3780/ddterm \nawesome extension.\n\nA GNOME Shell drop down terminal with extra feautures.\n \nSpecial thanks to:\n- Osman Alperen Elhan (https://github.com/oae)\n- Balder Claassen (https://github.com/balderclaassen)\n- Adrien Pyke (https://github.com/kufii)\n- Alan J Carvajal (https://github.com/ajcarvajal)\n- Massimo Mund (https://github.com/masmu)\n- Jakub Żywiec (https://github.com/jakubzet)\n- Mattias Eriksson (https://github.com/snaggen)\n- Henry78 (https://github.com/Henry78)\n- Maxim Toropov (https://github.com/MaxMaxoff)\nfor active contribution.\n\nBased on original extension \"gs-extensions-drop-down-terminal\" from Stéphane Démurget (https://github.com/zzrough)", "link": "https://extensions.gnome.org/extension/1509/drop-down-terminal-x/", "shell_version_map": {"38": {"version": "17", "sha256": "1k90g6bndw1xr56k7lwlxyw89aqbl47spkfmj1lq224z83w6hzdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRISVMgRVhURU5TSU9OIElTIE5PIExPTkdFUiBTVVBQT1JURUQuXG5cbklmIHlvdSBhcmUgbG9va2luZyBmb3IgYW4gYWx0ZXJuYXRpdmUgcGxlYXNlIGxvb2sgYXQgdGhhdCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zNzgwL2RkdGVybSBcbmF3ZXNvbWUgZXh0ZW5zaW9uLlxuXG5BIEdOT01FIFNoZWxsIGRyb3AgZG93biB0ZXJtaW5hbCB3aXRoIGV4dHJhIGZlYXV0dXJlcy5cbiBcblNwZWNpYWwgdGhhbmtzIHRvOlxuLSBPc21hbiBBbHBlcmVuIEVsaGFuIChodHRwczovL2dpdGh1Yi5jb20vb2FlKVxuLSBCYWxkZXIgQ2xhYXNzZW4gKGh0dHBzOi8vZ2l0aHViLmNvbS9iYWxkZXJjbGFhc3Nlbilcbi0gQWRyaWVuIFB5a2UgKGh0dHBzOi8vZ2l0aHViLmNvbS9rdWZpaSlcbi0gQWxhbiBKIENhcnZhamFsIChodHRwczovL2dpdGh1Yi5jb20vYWpjYXJ2YWphbClcbi0gTWFzc2ltbyBNdW5kIChodHRwczovL2dpdGh1Yi5jb20vbWFzbXUpXG4tIEpha3ViIFx1MDE3Ynl3aWVjIChodHRwczovL2dpdGh1Yi5jb20vamFrdWJ6ZXQpXG4tIE1hdHRpYXMgRXJpa3Nzb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9zbmFnZ2VuKVxuLSBIZW5yeTc4IChodHRwczovL2dpdGh1Yi5jb20vSGVucnk3OClcbi0gTWF4aW0gVG9yb3BvdiAoaHR0cHM6Ly9naXRodWIuY29tL01heE1heG9mZilcbmZvciBhY3RpdmUgY29udHJpYnV0aW9uLlxuXG5CYXNlZCBvbiBvcmlnaW5hbCBleHRlbnNpb24gXCJncy1leHRlbnNpb25zLWRyb3AtZG93bi10ZXJtaW5hbFwiIGZyb20gU3RcdTAwZTlwaGFuZSBEXHUwMGU5bXVyZ2V0IChodHRwczovL2dpdGh1Yi5jb20venpyb3VnaCkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcm9wLWRvd24tdGVybWluYWwteCIsCiAgImlkIjogImRyb3AtZG93bi10ZXJtaW5hbC14IiwKICAibmFtZSI6ICJEcm9wIERvd24gVGVybWluYWwgWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4wIiwKICAgICIzLjI4LjEiLAogICAgIjMuMjguMiIsCiAgICAiMy4zMC4wIiwKICAgICIzLjMwLjEiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zMi4wIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNC4wIiwKICAgICIzLjM0LjQiLAogICAgIjMuMzYuMCIsCiAgICAiMy4zNi4xIiwKICAgICIzLjM2LjIiLAogICAgIjMuMzguMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpZ2JuL2dzLWV4dGVuc2lvbnMtZHJvcC1kb3duLXRlcm1pbmFsIiwKICAidXVpZCI6ICJkcm9wLWRvd24tdGVybWluYWwteEBiaWdibi5wcm8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} -, {"uuid": "Rounded_Corners@lennart-k", "name": "Rounded Corners", "pname": "rounded-corners", "description": "Creates rounded corners for every monitor", "link": "https://extensions.gnome.org/extension/1514/rounded-corners/", "shell_version_map": {"38": {"version": "5", "sha256": "1lli47bjlrr5g3548jjvvvbbml6g0sg5mm6py9j7kjcgg84sscnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1lli47bjlrr5g3548jjvvvbbml6g0sg5mm6py9j7kjcgg84sscnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "Rounded_Corners@lennart-k", "name": "Rounded Corners", "pname": "rounded-corners", "description": "Creates rounded corners for every monitor", "link": "https://extensions.gnome.org/extension/1514/rounded-corners/", "shell_version_map": {"38": {"version": "5", "sha256": "1lli47bjlrr5g3548jjvvvbbml6g0sg5mm6py9j7kjcgg84sscnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "7", "sha256": "11accb4w8cx3gfrrs2x15h53arjkpqk566cp24c3k32alvqx1jgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "11accb4w8cx3gfrrs2x15h53arjkpqk566cp24c3k32alvqx1jgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "scrovol@andyholmes.github.io", "name": "Scrovol", "pname": "scrovol", "description": "Change the volume by scrolling anywhere on the System Tray.\n\nWith this extension, you can scroll over Night Light, WiFi, Volume, Battery or any other icon in the system status tray to change the volume, instead of just the Volume icon.", "link": "https://extensions.gnome.org/extension/1519/scrovol/", "shell_version_map": {"40": {"version": "4", "sha256": "1md52ygz481nvhq00bkq2ymby7f647cfvw4wx1wqkwp7b796d59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgdm9sdW1lIGJ5IHNjcm9sbGluZyBhbnl3aGVyZSBvbiB0aGUgU3lzdGVtIFRyYXkuXG5cbldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gc2Nyb2xsIG92ZXIgTmlnaHQgTGlnaHQsIFdpRmksIFZvbHVtZSwgQmF0dGVyeSBvciBhbnkgb3RoZXIgaWNvbiBpbiB0aGUgc3lzdGVtIHN0YXR1cyB0cmF5IHRvIGNoYW5nZSB0aGUgdm9sdW1lLCBpbnN0ZWFkIG9mIGp1c3QgdGhlIFZvbHVtZSBpY29uLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3Jvdm9sIiwKICAibmFtZSI6ICJTY3Jvdm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Nyb3ZvbC8iLAogICJ1dWlkIjogInNjcm92b2xAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "notification-center@Selenium-H", "name": "Notification Center", "pname": "notification-centerselenium-h", "description": "Detach notification center to top panel and customizations.Please reset the extension after updating.\nThe Extension will stop when upgraded to an incompatible version.\nIn that case an Update tab is created to easily reset the extension.\nA Reset button is also always present in Preferences option in the Top Right Application menu of the extension preferences window.", "link": "https://extensions.gnome.org/extension/1526/notification-centerselenium-h/", "shell_version_map": {"38": {"version": "24", "sha256": "1449kl7fss2fyj1ks8ra3qy60jvn5fcl1iyv813s8vdkkp5dv8a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiRGV0YWNoIG5vdGlmaWNhdGlvbiBjZW50ZXIgdG8gdG9wIHBhbmVsIGFuZCBjdXN0b21pemF0aW9ucy4iLAogICJkZXNjcmlwdGlvbiI6ICJEZXRhY2ggbm90aWZpY2F0aW9uIGNlbnRlciB0byB0b3AgcGFuZWwgYW5kIGN1c3RvbWl6YXRpb25zLlBsZWFzZSByZXNldCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0aW5nLlxuVGhlIEV4dGVuc2lvbiB3aWxsIHN0b3Agd2hlbiB1cGdyYWRlZCB0byBhbiBpbmNvbXBhdGlibGUgdmVyc2lvbi5cbkluIHRoYXQgY2FzZSBhbiBVcGRhdGUgdGFiIGlzIGNyZWF0ZWQgdG8gZWFzaWx5IHJlc2V0IHRoZSBleHRlbnNpb24uXG5BIFJlc2V0IGJ1dHRvbiBpcyBhbHNvIGFsd2F5cyBwcmVzZW50IGluIFByZWZlcmVuY2VzIG9wdGlvbiBpbiB0aGUgVG9wIFJpZ2h0IEFwcGxpY2F0aW9uIG1lbnUgb2YgdGhlIGV4dGVuc2lvbiBwcmVmZXJlbmNlcyB3aW5kb3cuIiwKICAibmFtZSI6ICJOb3RpZmljYXRpb24gQ2VudGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGlmaWNhdGlvbi1jZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvTm90aWZpY2F0aW9uLUNlbnRlciIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWNlbnRlckBTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "1449kl7fss2fyj1ks8ra3qy60jvn5fcl1iyv813s8vdkkp5dv8a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiRGV0YWNoIG5vdGlmaWNhdGlvbiBjZW50ZXIgdG8gdG9wIHBhbmVsIGFuZCBjdXN0b21pemF0aW9ucy4iLAogICJkZXNjcmlwdGlvbiI6ICJEZXRhY2ggbm90aWZpY2F0aW9uIGNlbnRlciB0byB0b3AgcGFuZWwgYW5kIGN1c3RvbWl6YXRpb25zLlBsZWFzZSByZXNldCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0aW5nLlxuVGhlIEV4dGVuc2lvbiB3aWxsIHN0b3Agd2hlbiB1cGdyYWRlZCB0byBhbiBpbmNvbXBhdGlibGUgdmVyc2lvbi5cbkluIHRoYXQgY2FzZSBhbiBVcGRhdGUgdGFiIGlzIGNyZWF0ZWQgdG8gZWFzaWx5IHJlc2V0IHRoZSBleHRlbnNpb24uXG5BIFJlc2V0IGJ1dHRvbiBpcyBhbHNvIGFsd2F5cyBwcmVzZW50IGluIFByZWZlcmVuY2VzIG9wdGlvbiBpbiB0aGUgVG9wIFJpZ2h0IEFwcGxpY2F0aW9uIG1lbnUgb2YgdGhlIGV4dGVuc2lvbiBwcmVmZXJlbmNlcyB3aW5kb3cuIiwKICAibmFtZSI6ICJOb3RpZmljYXRpb24gQ2VudGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGlmaWNhdGlvbi1jZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvTm90aWZpY2F0aW9uLUNlbnRlciIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWNlbnRlckBTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "lockkeys@fawtytoo", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock and Capslock status on the panel. Icons are auto hidden. Simplified with no menus, notifications or settings.\n\nWayland is only supported for Gnome Shell 3.38.", "link": "https://extensions.gnome.org/extension/1532/lock-keys/", "shell_version_map": {"38": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "LetItSnow@mateusz.banaszek.op.pl", "name": "Let it snow", "pname": "let-it-snow", "description": "Bring winter to your desktop: unicode snowflakes falling on your screens.\n\nFeatures:\n- snow doesn't fall over currently active window\n- use slider to choose how much snow you want\n- works with multiple monitors\n\nInspired by gsnow (https://extensions.gnome.org/extension/1156/gsnow/).", "link": "https://extensions.gnome.org/extension/1547/let-it-snow/", "shell_version_map": {"38": {"version": "5", "sha256": "07znrbba154277lxx1bvidn4kz5bgkxpgy7rv3sm472qdbsljl35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIHdpbnRlciB0byB5b3VyIGRlc2t0b3A6IHVuaWNvZGUgc25vd2ZsYWtlcyBmYWxsaW5nIG9uIHlvdXIgc2NyZWVucy5cblxuRmVhdHVyZXM6XG4tIHNub3cgZG9lc24ndCBmYWxsIG92ZXIgY3VycmVudGx5IGFjdGl2ZSB3aW5kb3dcbi0gdXNlIHNsaWRlciB0byBjaG9vc2UgaG93IG11Y2ggc25vdyB5b3Ugd2FudFxuLSB3b3JrcyB3aXRoIG11bHRpcGxlIG1vbml0b3JzXG5cbkluc3BpcmVkIGJ5IGdzbm93IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTU2L2dzbm93LykuIiwKICAibmFtZSI6ICJMZXQgaXQgc25vdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL21hdGJhbi9sZXQtaXQtc25vdyIsCiAgInV1aWQiOiAiTGV0SXRTbm93QG1hdGV1c3ouYmFuYXN6ZWsub3AucGwiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "fullscreen-hot-corner@sorrow.about.alice.pm.me", "name": "Fullscreen Hot Corner", "pname": "fullscreen-hot-corner", "description": "Enables hot corner in fullscreen mode", "link": "https://extensions.gnome.org/extension/1562/fullscreen-hot-corner/", "shell_version_map": {"38": {"version": "6", "sha256": "1lcpw06aqja4q7qqfvds5nv2zvzrjh56lymj1al4kiql92gbwzp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "9", "sha256": "0zx11gpacjd259cxd80ggffixpyqprvzcx1971ysvm7jrayrm058", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0zx11gpacjd259cxd80ggffixpyqprvzcx1971ysvm7jrayrm058", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"}}} -, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Customise the dash to be unique for each workspace, each with their own favourites\n* Only show running applications on the dash in their respective workspace\n* Choose a custom background image for each workspace\n* Minor UI tweaks to the overview workspaces\n* Save each customisation, set them to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nCompatible for use with any of these extensions to complete your workspace upgrade:\n\n* Dash to Panel - https://extensions.gnome.org/extension/1160/dash-to-panel/\n* Dash to Dock - https://extensions.gnome.org/extension/307/dash-to-dock/\n* Auto Move Windows - https://extensions.gnome.org/extension/16/auto-move-windows/\n* Vertical Overview - https://github.com/RensAlthuis/vertical-overview", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "0mjah9nx66caqmfbz8wrvg6iyhxp7jmbgwx1gnp8k2a2z536n1iw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDMwCn0="}, "40": {"version": "42", "sha256": "01cq0904ki57ymsil1s5d1m0r3rzm082z02c43arw0am6q9fnbar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "41": {"version": "42", "sha256": "01cq0904ki57ymsil1s5d1m0r3rzm082z02c43arw0am6q9fnbar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} +, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Customise the dash to be unique for each workspace, each with their own favourites\n* Only show running applications on the dash in their respective workspace\n* Choose a custom background image for each workspace\n* Minor UI tweaks to the overview workspaces\n* Save each customisation, set them to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nCompatible for use with any of these extensions to complete your workspace upgrade:\n\n* Dash to Panel - https://extensions.gnome.org/extension/1160/dash-to-panel/\n* Dash to Dock - https://extensions.gnome.org/extension/307/dash-to-dock/\n* Auto Move Windows - https://extensions.gnome.org/extension/16/auto-move-windows/\n* Vertical Overview - https://github.com/RensAlthuis/vertical-overview", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "0mjah9nx66caqmfbz8wrvg6iyhxp7jmbgwx1gnp8k2a2z536n1iw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDMwCn0="}, "40": {"version": "43", "sha256": "0crrciyngn4jb005hb2dl9pmyd5j4n5spladk395czwi9h4df7l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "0crrciyngn4jb005hb2dl9pmyd5j4n5spladk395czwi9h4df7l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} , {"uuid": "NordVPN_Connect@poilrouge.fr", "name": "NordVPN Connect", "pname": "nordvpn-connect", "description": "Unofficial Gnome-Shell Extension to provide a GUI for the official NordVPN CLI Tool.", "link": "https://extensions.gnome.org/extension/1595/nordvpn-connect/", "shell_version_map": {"38": {"version": "15", "sha256": "0xccvy3kqgglhcjhixlxi65sa49lbm896lra2sks65arkx3fh63k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsZXhQb2lscm91Z2UvTm9yZFZQTi1jb25uZWN0IiwKICAidXVpZCI6ICJOb3JkVlBOX0Nvbm5lY3RAcG9pbHJvdWdlLmZyIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "18", "sha256": "0isn56fj58aikld1fy8q3afqg2acsz4wbfskzip25xsbc0hpy9qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleFBvaWxyb3VnZS9Ob3JkVlBOLWNvbm5lY3QiLAogICJ1dWlkIjogIk5vcmRWUE5fQ29ubmVjdEBwb2lscm91Z2UuZnIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0isn56fj58aikld1fy8q3afqg2acsz4wbfskzip25xsbc0hpy9qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleFBvaWxyb3VnZS9Ob3JkVlBOLWNvbm5lY3QiLAogICJ1dWlkIjogIk5vcmRWUE5fQ29ubmVjdEBwb2lscm91Z2UuZnIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"uuid": "arrangeWindows@sun.wxg@gmail.com", "name": "Arrange Windows", "pname": "arrange-windows", "description": "Arrange windows on the monitors\n\nHotkeys:\n Ctrl+Alt+1 Cascade windows\n Ctrl+Alt+2 Tiling windows\n Ctrl+Alt+3 Side by side windows\n Ctrl+Alt+4 Stack windows", "link": "https://extensions.gnome.org/extension/1604/arrange-windows/", "shell_version_map": {"38": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "40": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "fullscreen-notifications@sorrow.about.alice.pm.me", "name": "Fullscreen Notifications", "pname": "fullscreen-notifications", "description": "Enables all notifications in fullscreen mode", "link": "https://extensions.gnome.org/extension/1610/fullscreen-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "1g1dgrhbif7qcxga7302bhhdjrr2v3vkp6dfavyclzsdkkrr2wwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "5", "sha256": "1cxpgvkpm1r8d14wvl8pic7p6wd4im8cj3dklnzb7ni2ks2h0cps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1cxpgvkpm1r8d14wvl8pic7p6wd4im8cj3dklnzb7ni2ks2h0cps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -251,7 +251,7 @@ , {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "vim-altTab@kokong.info", "name": "VIM Alt-Tab", "pname": "vim-alt-tab", "description": "Add the ability to switch between windows and applications using vim-like keypresses (h, j, k, l)", "link": "https://extensions.gnome.org/extension/2212/vim-alt-tab/", "shell_version_map": {"38": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "easy_docker_containers@red.software.systems", "name": "Easy Docker Containers", "pname": "easy-docker-containers", "description": "A GNOME Shell extension (GNOME Panel applet) to be able to generally control your available Docker containers.", "link": "https://extensions.gnome.org/extension/2224/easy-docker-containers/", "shell_version_map": {"38": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle your light and dark GTK, GNOME Shell, icon and cursor themes variants, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "13vq56mhxkh61zza1j4pszbbbz96z2yjzgkzq8qi51jidpdby521", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "51", "sha256": "1lbfbb6acc70y70v5g3mvqhzn6240jdq0zzlnh43yg1kvry20d2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "55", "sha256": "1sv0wm9fq6f1j384qz91f8vkxk3ffb02ih1x6apa70k2ybmrc06g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTUKfQ=="}}} +, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle the color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "0x3mggffn6ydfkv09gwq62wgkm8zga214616jp60mpwp4ly0xphm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "51", "sha256": "1pnljdl2syh0lv2ih2ps2im2pnyzkwsbzsvv3f8q7zf669jxca9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "55", "sha256": "151lwn6qlh1b91f9c58s7xw5jd7ygvqpr68299qqgn7hvjg0qh6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTUKfQ=="}}} , {"uuid": "binaryclock@vancha.march", "name": "binaryclock", "pname": "binaryclock", "description": "adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": {"38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "1v8rw7msfy2d8nwnppdpci62sl6iw8973z5gsl8024awl27ni38z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcyIsCiAgIm5hbWUiOiAidHBfd2F0dG1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjAiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naXN0YXJ0L3RwX3dhdHRtZXRlciIsCiAgInV1aWQiOiAidHBfd2F0dG1ldGVyQGdpc3RhcnQiLAogICJ2ZXJzaW9uIjogNAp9"}}} @@ -293,7 +293,7 @@ , {"uuid": "activities_icons@fawtytoo", "name": "Activities Icons", "pname": "activities-icons", "description": "The Activities button becomes 2 icons for selecting either Applications or Workspaces in the overview. Selecting the same view again will hide the overview.\nScrolling on the icons allows switching windows on a workspace or cycling through the Workspaces.", "link": "https://extensions.gnome.org/extension/2872/activities-icons/", "shell_version_map": {"38": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "transparent_panel@fawtytoo", "name": "Transparent Top Panel", "pname": "transparent-top-panel", "description": "Totally transparent top panel in the Overview.\nAlso adds drop shadows to text and icons for those using GS 3.38.", "link": "https://extensions.gnome.org/extension/2878/transparent-top-panel/", "shell_version_map": {"38": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"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.\n\n>>> Read compatibility note on GitHub there is also bug reporting <<<", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "19icczlk4j8a1fdl19lqzinx9l82lwnvj5q8xaazvgm4yicxmh4b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "16", "sha256": "0bwpxfc2wjvv254fnr05q3cvs1r0jw0fdj7n8b20vdwry48n30vb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML1RyYXktSWNvbnMtUmVsb2FkZWQiLAogICJ1dWlkIjogInRyYXlJY29uc1JlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "19", "sha256": "00sgwpkfwfaqjf58j3i3w4brinmrc6x0dr6pf06vbp8vpzf51vdc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iLAogICAgIllhZCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} +, {"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.\n\n>>> Read compatibility note on GitHub there is also bug reporting <<<", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "19icczlk4j8a1fdl19lqzinx9l82lwnvj5q8xaazvgm4yicxmh4b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "16", "sha256": "0bwpxfc2wjvv254fnr05q3cvs1r0jw0fdj7n8b20vdwry48n30vb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML1RyYXktSWNvbnMtUmVsb2FkZWQiLAogICJ1dWlkIjogInRyYXlJY29uc1JlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "21", "sha256": "1h9wbslnwhy5zxw7qgvxzlar82wbhmd19cbixfmnk0xfml11gvjb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iLAogICAgIllhZCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} , {"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": "10", "sha256": "1aynp04pxp3wbjxf264y731sk7cgas9y494b1ca4y9mk85d8w2qz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1aynp04pxp3wbjxf264y731sk7cgas9y494b1ca4y9mk85d8w2qz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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 user/aggregate menu. Originally created by XES.\n\nv10: fix for older versions, i havent tested this on anything below 3.10, v9: minor cleanup, now has an icon for the main menu entry. \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 (3.8 replace Settings code credit IsacDaavid)\n\nCredit to @peaceseeker for updating this with a working repo, i do wish it could have been pushed to me but my blank repo was deleted as it was stale, i failed to push to git before going back to work around 1.5 years ago and i hadn't been active enough to notice anything other than emails(these things help people!)", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "150x8xp9xm28scw5lcmxq7xcfa17wbzy2y381xsv0mv0b03kvyqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuNS40IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "9", "sha256": "1687rhzy0ckpfph1x7ga05wmg6515p5y5yd5sq585hc8y2bclp7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1687rhzy0ckpfph1x7ga05wmg6515p5y5yd5sq585hc8y2bclp7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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"}}} @@ -363,7 +363,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": "6", "sha256": "0qddl83x30y6jqm4nyjk6faklmv7cii2czmgmagcyllgkh0simav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3dpcmVndWFyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIndpcmVndWFyZC1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"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, with various layouts to choose from!\n\nSupports GNOME shell 3.36, 3.38, 40, and 41.\n\nFor older GNOME shell versions visit https://extensions.gnome.org/extension/1228/arc-menu/\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": "17", "sha256": "0llq0zkvgxarr30s304n1ilidbwc0kx4l2impby5y2sdsvr7zafv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "21", "sha256": "0dpxr8afhr1n4hywyzhrjkya3b1md512flf4wja39ahjkb4cdgmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "0dpxr8afhr1n4hywyzhrjkya3b1md512flf4wja39ahjkb4cdgmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application Menu for GNOME, with various layouts to choose from!\n\nSupports GNOME shell 3.36, 3.38, 40, and 41.\n\nFor older GNOME shell versions visit https://extensions.gnome.org/extension/1228/arc-menu/\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": "17", "sha256": "0llq0zkvgxarr30s304n1ilidbwc0kx4l2impby5y2sdsvr7zafv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "23", "sha256": "1f59gpin72r5jfdqijicxrwjhsnmnxc09mmscr16d5ll5cvvkyid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "1f59gpin72r5jfdqijicxrwjhsnmnxc09mmscr16d5ll5cvvkyid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"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": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "Move workspaces up or down in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "6", "sha256": "1f0hl2dzl75dwcv8jzx3rk1laqd9y9m32g219nvbhsmk8rjxfc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd29ya3NwYWNlcyB1cCBvciBkb3duIGluIHRoZSBvdmVydmlldyB3aXRoIEFsdCtVcC9BbHQrRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plcmVtaWFobWVnZWwvZ25vbWUtcmVvcmRlci13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJyZW9yZGVyLXdvcmtzcGFjZXNAamVyLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -392,7 +392,7 @@ , {"uuid": "wacom-indicator@fthx", "name": "Wacom Indicator", "pname": "wacom-indicator", "description": "Wacom tablet indicator in the top bar: connection state and power level.\n\n On click: open GNOME Settings Wacom section. On hover or every minute: update connection state and power level.\n\n Settings (in extension.js file headers): show/hide model label, refresh delay, update/do nothing on indicator hover, show/hide if disconnected.", "link": "https://extensions.gnome.org/extension/3809/wacom-indicator/", "shell_version_map": {"38": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hibernate@dafne.rocks", "name": "System Action - Hibernate", "pname": "system-action-hibernate", "description": "A GNOME extension that adds the option to hibernate amongst other system actions", "link": "https://extensions.gnome.org/extension/3814/system-action-hibernate/", "shell_version_map": {"38": {"version": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "click-to-close-overview@l3nn4rt.github.io", "name": "Click to close overview", "pname": "click-to-close-overview", "description": "Close the overview by clicking empty space.", "link": "https://extensions.gnome.org/extension/3826/click-to-close-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "17xd3k1xpsn8ma6f11f4sr26y5xbcs3hiw7lv1qqrn80lyjj2vz1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner\n- Keyboard Layout Visibility\n- Notification Banner Position\n- OSD Visibility\n- Panel Arrow Visibility(3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate Menu) Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon(40, 41)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\n- Workspace Switcher Visibility\n- Workspace Wraparound", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} +, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Notification Banner Position\n- OSD Visibility\n- Panel Arrow Visibility(3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36, 3.38, 40, 41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate Menu) Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon(40, 41)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\n- Workspace Switcher Visibility\n- Workspace Wraparound", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "15qv09ji5fh887hgazcxhb8z4m4n60h8p379zfns03h3918bbmrx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kIiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "workspaces-bar@fthx", "name": "Workspaces Bar", "pname": "workspaces-bar", "description": "Replace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\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/3851/workspaces-bar/", "shell_version_map": {"38": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "scanlines-effect@muratcileli.com", "name": "Scanlines Effect", "pname": "scanlines-effect", "description": "Retro monitor / CRT TV effect.", "link": "https://extensions.gnome.org/extension/3860/scanlines-effect/", "shell_version_map": {"38": {"version": "1", "sha256": "1xcsd700s9hkqmrqlv56ldiya2jk0d46j8k4a4i3m9c6k40c5z7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJldHJvIG1vbml0b3IgLyBDUlQgVFYgZWZmZWN0LiIsCiAgIm5hbWUiOiAiU2NhbmxpbmVzIEVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20ubXVyYXRjaWxlbGkuc2NhbmxpbmVzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211cmF0LWNpbGVsaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NhbmxpbmVzLWVmZmVjdCIsCiAgInV1aWQiOiAic2NhbmxpbmVzLWVmZmVjdEBtdXJhdGNpbGVsaS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "workspaces-thumbnails-applet@blogdron", "name": "Workspaces Thumbnails Applet", "pname": "workspaces-thumbnails-applet", "description": "Notice!\n\nThis is a fork of the extension https://extensions.gnome.org/extension/2557/workspaces-thumbnails/ It hasn't been updated in a long time, but it only needs a small fix to work. Until the author fixes the problem, I will keep this fork. Please, if you have the opportunity to contact the author of the original extension, let him fix the problem for himself.\n\n\nPut an indicator on the panel showing all the workspaces thumbnails, allowing to switch between them or moving windows to another workspace.\n\n This is a very tiny fork of the original (GNOME official extension) Workspace Indicator, allowing to use it like when the Horizontal Workspaces extension is activated. The vertical workspaces layout is not modified; the workspaces layout is horizontal only in the top panel and the workspaces switcher in the overview is still showed. Please note that any global bug should be reported against the Workspace Indicator extension. https://extensions.gnome.org/extension/21/workspace-indicator", "link": "https://extensions.gnome.org/extension/3872/workspaces-thumbnails-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "02823b6rfnibb0mhnx848pdxc3birw2aqp8607wjf93mvy5388hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGljZSFcblxuVGhpcyBpcyBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yNTU3L3dvcmtzcGFjZXMtdGh1bWJuYWlscy8gSXQgaGFzbid0IGJlZW4gdXBkYXRlZCBpbiBhIGxvbmcgdGltZSwgYnV0IGl0IG9ubHkgbmVlZHMgYSBzbWFsbCBmaXggdG8gd29yay4gVW50aWwgdGhlIGF1dGhvciBmaXhlcyB0aGUgcHJvYmxlbSwgSSB3aWxsIGtlZXAgdGhpcyBmb3JrLiBQbGVhc2UsIGlmIHlvdSBoYXZlIHRoZSBvcHBvcnR1bml0eSB0byBjb250YWN0IHRoZSBhdXRob3Igb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiwgbGV0IGhpbSBmaXggdGhlIHByb2JsZW0gZm9yIGhpbXNlbGYuXG5cblxuUHV0IGFuIGluZGljYXRvciBvbiB0aGUgcGFuZWwgc2hvd2luZyBhbGwgdGhlIHdvcmtzcGFjZXMgdGh1bWJuYWlscywgYWxsb3dpbmcgdG8gc3dpdGNoIGJldHdlZW4gdGhlbSBvciBtb3Zpbmcgd2luZG93cyB0byBhbm90aGVyIHdvcmtzcGFjZS5cblxuIFRoaXMgaXMgYSB2ZXJ5IHRpbnkgZm9yayBvZiB0aGUgb3JpZ2luYWwgKEdOT01FIG9mZmljaWFsIGV4dGVuc2lvbikgV29ya3NwYWNlIEluZGljYXRvciwgYWxsb3dpbmcgdG8gdXNlIGl0IGxpa2Ugd2hlbiB0aGUgSG9yaXpvbnRhbCBXb3Jrc3BhY2VzIGV4dGVuc2lvbiBpcyBhY3RpdmF0ZWQuIFRoZSB2ZXJ0aWNhbCB3b3Jrc3BhY2VzIGxheW91dCBpcyBub3QgbW9kaWZpZWQ7IHRoZSB3b3Jrc3BhY2VzIGxheW91dCBpcyBob3Jpem9udGFsIG9ubHkgaW4gdGhlIHRvcCBwYW5lbCBhbmQgdGhlIHdvcmtzcGFjZXMgc3dpdGNoZXIgaW4gdGhlIG92ZXJ2aWV3IGlzIHN0aWxsIHNob3dlZC4gUGxlYXNlIG5vdGUgdGhhdCBhbnkgZ2xvYmFsIGJ1ZyBzaG91bGQgYmUgcmVwb3J0ZWQgYWdhaW5zdCB0aGUgV29ya3NwYWNlIEluZGljYXRvciBleHRlbnNpb24uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzIxL3dvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJleHRlbnNpb24taWQiOiAid29ya3NwYWNlcy10aHVtYm5haWxzLWFwcGxldCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldvcmtzcGFjZXMgVGh1bWJuYWlscyBBcHBsZXQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiLAogICAgImJsb2dkcm9uIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtdGh1bWJuYWlscy1hcHBsZXRAYmxvZ2Ryb24iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -413,12 +413,12 @@ , {"uuid": "toggle-alacritty@itstime.tech", "name": "Toggle Alacritty", "pname": "toggle-alacritty", "description": "Toggles Alacritty window via hotkey: Alt+z\n\nIf Alacritty is not launched, attempts to start it (/usr/bin/alacritty)\n\nWorks under both Wayland and X11\n\nTo change hotkey please follow instruction in the README.md:", "link": "https://extensions.gnome.org/extension/3942/toggle-alacritty/", "shell_version_map": {"38": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "hide-panel@fthx", "name": "Hide Panel", "pname": "hide-panel", "description": "Hide top panel except in overview. Switch button in panel.\n\nVery very light extension. There is a 1 pixel wide line at the top of the screen that allows to blindly use the panel menus. This is needed to keep the native hot corner active without having to recreate it.", "link": "https://extensions.gnome.org/extension/3948/hide-panel/", "shell_version_map": {"38": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "persistent-email-notifications@fthx", "name": "Persistent Email Notifications", "pname": "persistent-email-notifications", "description": "Never hide a new mail notification, except if you close it.\n\nVery very light extension. Email clients supported: Thunderbird, Evolution, Geary, Mailspring, TypeApp, BlueMail. Please ask for another email client if needed.", "link": "https://extensions.gnome.org/extension/3951/persistent-email-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right.\n\nThere could be an error with the extension after update. The solution is to logout and login again.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "17qfpkgah0npp07947ayg1zbc8fqy7ljabx717vfmhwddgmj1zb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "17qfpkgah0npp07947ayg1zbc8fqy7ljabx717vfmhwddgmj1zb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "17qfpkgah0npp07947ayg1zbc8fqy7ljabx717vfmhwddgmj1zb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right.\n\nYou can change the widgets position with preferences. The widget can be pinned to right corner (status area) default, center (data time area) and left corner (activities area).\n\nThere could be an error with the extension after update. The solution is to logout and login again.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "1zzgxr6iq8c3drpd2n9hqly5pv827qpfy2kbjyzzzgxcvz5002df", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "kitchentimer@blackjackshellac.ca", "name": "Kitchen Timer", "pname": "kitchen-timer", "description": "General purpose timer extension for Gnome Shell\n\nPlease report issues on github\n\nIf updating the extension reports an ERROR, it should work after the next reboot or if you logout and login again.", "link": "https://extensions.gnome.org/extension/3955/kitchen-timer/", "shell_version_map": {"38": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com", "name": "GNOME Fuzzy App Search", "pname": "gnome-fuzzy-app-search", "description": "Fuzzy application search results for Gnome Search", "link": "https://extensions.gnome.org/extension/3956/gnome-fuzzy-app-search/", "shell_version_map": {"38": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "e-ink-mode@fujimo-t.github.io", "name": "E Ink Mode", "pname": "e-ink-mode", "description": "Make desktop suitable for E Ink monitors.\n\nUnmaintenanced.\nPlease migrate to theme:\nhttps://github.com/fujimo-t/gnome-shell-theme-e-ink\nSee below to detail:\nhttps://github.com/fujimo-t/gnome-shell-extension-e-ink-mode/issues/3#issuecomment-1019159171", "link": "https://extensions.gnome.org/extension/3957/e-ink-mode/", "shell_version_map": {"40": {"version": "3", "sha256": "0khqna60a0vblygriiky0jzg92ib8i44i6wkr8s3vxi0bcfa2zhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZGVza3RvcCBzdWl0YWJsZSBmb3IgRSBJbmsgbW9uaXRvcnMuXG5cblVubWFpbnRlbmFuY2VkLlxuUGxlYXNlIG1pZ3JhdGUgdG8gdGhlbWU6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtdGhlbWUtZS1pbmtcblNlZSBiZWxvdyB0byBkZXRhaWw6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUvaXNzdWVzLzMjaXNzdWVjb21tZW50LTEwMTkxNTkxNzEiLAogICJuYW1lIjogIkUgSW5rIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUiLAogICJ1dWlkIjogImUtaW5rLW1vZGVAZnVqaW1vLXQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "transparent-top-bar@ftpix.com", "name": "Transparent Top Bar (Adjustable transparency)", "pname": "transparent-top-bar-adjustable-transparency", "description": "Fork of: https://github.com/zhanghai/gnome-shell-extension-transparent-top-bar\n\nBring back the transparent top bar in GNOME Shell with adjustable transparency.\n\nDoes not work well with custom shell themes.", "link": "https://extensions.gnome.org/extension/3960/transparent-top-bar-adjustable-transparency/", "shell_version_map": {"38": {"version": "5", "sha256": "09mym8h6lpb53b18c72vzl2y7myl1xg1lyg9jryf3nijna9adnr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "gnome4synology@psasse.gmx.de", "name": "Movie Search provider for Synology®", "pname": "gnome-movie-search-provider-for-synology", "description": "search provider for movie titles on Synology® NAS including offline search (yet to come)", "link": "https://extensions.gnome.org/extension/3969/gnome-movie-search-provider-for-synology/", "shell_version_map": {"40": {"version": "14", "sha256": "133jgh7s8mdc4dbcwr623yyrpfb8nv96iggsk2kb18lkw2rcf3xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNlYXJjaCBwcm92aWRlciBmb3IgbW92aWUgdGl0bGVzIG9uIFN5bm9sb2d5XHUwMGFlIE5BUyBpbmNsdWRpbmcgb2ZmbGluZSBzZWFyY2ggKHlldCB0byBjb21lKSIsCiAgIm5hbWUiOiAiTW92aWUgU2VhcmNoIHByb3ZpZGVyIGZvciBTeW5vbG9neVx1MDBhZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wc2Fzc2U3Mi9tb3ZpZXM0c3lub2xvZ3kiLAogICJ1dWlkIjogImdub21lNHN5bm9sb2d5QHBzYXNzZS5nbXguZGUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "guillotine@fopdoodle.net", "name": "Guillotine", "pname": "guillotine", "description": "Guillotine is a gnome extension designed for efficiently carrying out executions of commands from a customizable menu. Simply speaking: it is a highly customizable menu that enables you to launch commands and toggle services.", "link": "https://extensions.gnome.org/extension/3981/guillotine/", "shell_version_map": {"38": {"version": "3", "sha256": "0r171an47d1fdhzwiq7kg59hasibmcvvcsv9z9xd1kh5jahzmam5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "shuzhi@tuberry", "name": "Shu Zhi", "pname": "shu-zhi", "description": "Wallpaper generation extension for GNOME Shell, inspired by Jizhi\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3985/shu-zhi/", "shell_version_map": {"38": {"version": "7", "sha256": "1yk39q1ydv7kmb8shi4cp7pf5zvpmj99gjl9svack4773dj9rrwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInNodXpoaSIsCiAgIm5hbWUiOiAiU2h1IFpoaSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV6aGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NodXpoaSIsCiAgInV1aWQiOiAic2h1emhpQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "17", "sha256": "1n0ajmm6d7y6kify6k9g3j2kc3ass9s7zyif5jhr1djzsi6knpq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "19", "sha256": "1ib82yf7gh97hygbrxccpsh75jpg65rp834vygi25kyf0b8fykff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"}}} @@ -433,6 +433,7 @@ , {"uuid": "alttab-mod@leleat-on-github", "name": "AltTab Mod", "pname": "alttab-mod", "description": "Alt/Super+Tab can also be navigated with WASD and hjkl. Q just closes the selected item and only the first window will be raised on app activation. Optionally, only show windows from the current workspace or monitor and remove the slight popup delay.", "link": "https://extensions.gnome.org/extension/4007/alttab-mod/", "shell_version_map": {"38": {"version": "6", "sha256": "069086j1855s0zrawx49h40l3qmzbsjl0n58wr74lxfk1s6sirww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "personalize@Selenium-H", "name": "Personalize", "pname": "personalize", "description": "Personalize the looks of GNOME Desktop.\n\nSet the theme variant, window corner curvature and select accent color.\nThe Colors section contains colors generated from the selected accent color.\nThe color generation is not accurate. However, individual colors can be customised.\n\nNot all settings are applied automatically.\nPress Refresh button on the left of the headerbar to reload the extension \n\nCurrently, only Adwaita theme is supported. Also, Adwaita and Adwaita-dark gtk-2 themes\nmust be installed for the extension to work properly. Not all widgets are themed perfectly.", "link": "https://extensions.gnome.org/extension/4010/personalize/", "shell_version_map": {"38": {"version": "1", "sha256": "1rgh2zq7086ymf0222pbrx5n8q11v3f45095w4x3ikw7k12j9s0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiUGVyc29uYWxpemUgR05PTUUgdGhlbWUgYW5kIGN1c3RvbWl6ZSB0aGVtLiIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNvbmFsaXplIHRoZSBsb29rcyBvZiBHTk9NRSBEZXNrdG9wLlxuXG5TZXQgdGhlIHRoZW1lIHZhcmlhbnQsIHdpbmRvdyBjb3JuZXIgY3VydmF0dXJlIGFuZCBzZWxlY3QgYWNjZW50IGNvbG9yLlxuVGhlIENvbG9ycyBzZWN0aW9uIGNvbnRhaW5zIGNvbG9ycyBnZW5lcmF0ZWQgZnJvbSB0aGUgc2VsZWN0ZWQgYWNjZW50IGNvbG9yLlxuVGhlIGNvbG9yIGdlbmVyYXRpb24gaXMgbm90IGFjY3VyYXRlLiBIb3dldmVyLCBpbmRpdmlkdWFsIGNvbG9ycyBjYW4gYmUgY3VzdG9taXNlZC5cblxuTm90IGFsbCBzZXR0aW5ncyBhcmUgYXBwbGllZCBhdXRvbWF0aWNhbGx5LlxuUHJlc3MgUmVmcmVzaCBidXR0b24gb24gdGhlIGxlZnQgb2YgdGhlIGhlYWRlcmJhciB0byByZWxvYWQgdGhlIGV4dGVuc2lvbiBcblxuQ3VycmVudGx5LCBvbmx5IEFkd2FpdGEgdGhlbWUgaXMgc3VwcG9ydGVkLiBBbHNvLCBBZHdhaXRhIGFuZCBBZHdhaXRhLWRhcmsgZ3RrLTIgdGhlbWVzXG5tdXN0IGJlIGluc3RhbGxlZCBmb3IgdGhlIGV4dGVuc2lvbiB0byB3b3JrIHByb3Blcmx5LiBOb3QgYWxsIHdpZGdldHMgYXJlIHRoZW1lZCBwZXJmZWN0bHkuIiwKICAibmFtZSI6ICJQZXJzb25hbGl6ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzb25hbGl6ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJzdGF0dXMiOiAiICIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2VsZW5pdW0tSC9QZXJzb25hbGl6ZSIsCiAgInV1aWQiOiAicGVyc29uYWxpemVAU2VsZW5pdW0tSCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "gnomebedtime@ionutbortis.gmail.com", "name": "Bedtime Mode", "pname": "gnome-bedtime", "description": "Hey Gnome, it's bedtime! Converts to grayscale the entire Gnome workspace by using a smooth transition. Best to use during evening/night.\n\nThis behaviour is similar to Android's bedtime mode which converts the phone screen to grayscale. It should somewhat make your device less appealing and limit the usage of it before bedtime. On my side, at least, it still requires a fair amount of self control in order to make that happen.\n\nThe extension has a nice Settings UI where you can customize it to your liking:\n- Set an automatic schedule for turning on/off the Bedtime Mode\n- Add an On Demand button to Top Bar or System Menu to manually toggle the mode\n- Control the On Demand button visibility, appearance and position in Top Bar\n- Choose another color preset and intensity, if you prefer a different color scheme\n- Change color intensity on the fly by scrolling over the On Demand button in Top Bar\n\nMulti language support is also available, please check the GitHub page if you want to help with the translations. So far, the extension is fully translated to Spanish, Dutch, German, Romanian and English.\n\nIf you want to use a keyboard shortcut in order to toggle the Bedtime Mode then you can use this command for the shortcut:\n\nbash -c 'schema_id=org.gnome.shell.extensions.bedtime-mode; schema_dir=~/.local/share/gnome-shell/extensions/gnomebedtime@ionutbortis.gmail.com/schemas/; if [[ $(gsettings --schemadir $schema_dir get $schema_id bedtime-mode-active) == \"true\" ]]; then turn_on=false; else turn_on=true; fi; gsettings --schemadir $schema_dir set $schema_id bedtime-mode-active $turn_on;'", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "spotify-controller@koolskateguy89", "name": "Spotify Controller", "pname": "spotify-controller", "description": "Control Spotify from the topbar!\n\nCredit to Marcus Heine (https://github.com/mheine) for most of the code in this extension.", "link": "https://extensions.gnome.org/extension/4013/spotify-controller/", "shell_version_map": {"38": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "transparentwindows.mdirshad07", "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.", "link": "https://extensions.gnome.org/extension/4016/transparent-window/", "shell_version_map": {"38": {"version": "2", "sha256": "12d8ad0s3b2cd8gczsa2l2x5wf3rag9xfr12ljw2jlrzf99vnr70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BieHFkb3duL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC13aW5kb3ciLAogICJ1dWlkIjogInRyYW5zcGFyZW50d2luZG93cy5tZGlyc2hhZDA3IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "wandering-pixel@justinrdonnelly.github.com", "name": "Wandering Pixel", "pname": "wandering-pixel", "description": "Slide 1 pixel back and forth in the top bar as a workaround for various bugs in GNOME Shell and/or Mutter.", "link": "https://extensions.gnome.org/extension/4028/wandering-pixel/", "shell_version_map": {"38": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "screenshot-directory@fawtytoo", "name": "Screenshot Directory", "pname": "screenshot-directory", "description": "The default screenshot directory is ~/Pictures. This extension changes that to use whatever is set if you used the Gnome Screenshot app. This can be found in the dconf setting: /org/gnome/gnome-screenshot/last-save-directory. If that directory doesn't exist, the extension will use the Home directory instead.\n\nNote: If the dconf setting doesn't exist, you need to install the Gnome Screenshot app.\n\nThe idea was taken from the extension: Screenshot Locations.", "link": "https://extensions.gnome.org/extension/4031/screenshot-directory/", "shell_version_map": {"38": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}, "40": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}, "41": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}}} @@ -447,15 +448,16 @@ , {"uuid": "spotify-artwork-fixer@wjt.me.uk", "name": "Spotify Artwork Fixer", "pname": "spotify-artwork-fixer", "description": "Fix Spotify artwork missing in media notification", "link": "https://extensions.gnome.org/extension/4055/spotify-artwork-fixer/", "shell_version_map": {"38": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "Custom VPN Toggler (and indicator) allows to see the status of a VPN (with its icon), see IP address associated and permit to start and stop VPN (from a menu).\n\nThis plugin required an additional script to interact with VPN. \nAn example for netExtender and GlobalProtect are available on extension repository. \nFollow the link to Extension Web Site and see README.", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "5", "sha256": "09axc2jx7s2bak956yyv6c5826yl54ghriiwdgsajly5lncmypxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikgYWxsb3dzIHRvIHNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSwgc2VlIElQIGFkZHJlc3MgYXNzb2NpYXRlZCBhbmQgcGVybWl0IHRvIHN0YXJ0IGFuZCBzdG9wIFZQTiAoZnJvbSBhIG1lbnUpLlxuXG5UaGlzIHBsdWdpbiByZXF1aXJlZCBhbiBhZGRpdGlvbmFsIHNjcmlwdCB0byBpbnRlcmFjdCB3aXRoIFZQTi4gXG5BbiBleGFtcGxlIGZvciBuZXRFeHRlbmRlciBhbmQgR2xvYmFsUHJvdGVjdCBhcmUgYXZhaWxhYmxlIG9uIGV4dGVuc2lvbiByZXBvc2l0b3J5LiBcbkZvbGxvdyB0aGUgbGluayB0byBFeHRlbnNpb24gV2ViIFNpdGUgYW5kIHNlZSBSRUFETUUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJmci5naXRlZHViZXJnZXIuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Show a tray icon for Geary\n\nhttps://github.com/TaylanTatli/geary-tray-icon", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "1", "sha256": "11kv47pz5p69j10r23zf8ls3fmanldx7diwsy34fhyxqfxjcd614", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSB0cmF5IGljb24gZm9yIEdlYXJ5XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9UYXlsYW5UYXRsaS9nZWFyeS10cmF5LWljb24iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZWFyeS10cmF5LWljb25AdGF5bGFudGF0bGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"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": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"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": "1h6gm4mc2snwza4r1k9zz1a9wkfmgiqlcvn72hqqasvqrf5sz7cz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhL3RyZWUvNDAucmMiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "29", "sha256": "1z0c3yrdvdxlii1i3068aa8nwn6sxrashy0lmkzn89vi9qw1rba5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwLjAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYS90cmVlLzQwLnJjIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "1z0c3yrdvdxlii1i3068aa8nwn6sxrashy0lmkzn89vi9qw1rba5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwLjAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYS90cmVlLzQwLnJjIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}}} +, {"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": "36", "sha256": "0516845q04p2jpq3ljbd6wn4y1vzq1x9qrs6ygkiqkg0q6apshg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "41": {"version": "36", "sha256": "0516845q04p2jpq3ljbd6wn4y1vzq1x9qrs6ygkiqkg0q6apshg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} , {"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"}}} , {"uuid": "right_click_for_apps@briansayre", "name": "Right Click for Apps", "pname": "right-click-for-apps", "description": "Allows you to right-click the Activities button to reveal the application menu.", "link": "https://extensions.gnome.org/extension/4090/right-click-for-apps/", "shell_version_map": {"38": {"version": "1", "sha256": "1rzx8ksl48badrwyqxwbgvfgf48z642mdwl57aq280ng61nrndaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcmlnaHQtY2xpY2sgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIHRvIHJldmVhbCB0aGUgYXBwbGljYXRpb24gbWVudS4iLAogICJuYW1lIjogIlJpZ2h0IENsaWNrIGZvciBBcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJpYW5zYXlyZS9SaWdodC1DbGljay1Gb3ItQXBwcyIsCiAgInV1aWQiOiAicmlnaHRfY2xpY2tfZm9yX2FwcHNAYnJpYW5zYXlyZSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "devbar@ludvigbostrom", "name": "DevBar", "pname": "devbar", "description": "This extension helps you keep track of your development workflow.", "link": "https://extensions.gnome.org/extension/4091/devbar/", "shell_version_map": {"38": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "notifications_to_file@fawtytoo", "name": "Notifications To File", "pname": "notifications-to-file", "description": "Notifications are appended to a file in $HOME/.notifications/ with one file created per day.\nEntries show the following information:\nTimestamp\nWhether the banner was shown\nThe urgency\nThe title\nBanner text", "link": "https://extensions.gnome.org/extension/4093/notifications-to-file/", "shell_version_map": {"38": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "change_desktop_background_when_empty@fawtytoo", "name": "Change Desktop Background When Workspace Empty", "pname": "change-desktop-background-when-workspace-empty", "description": "Changes the desktop background when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login.\nNo folder needs to be set explicitly, as it will use the folder that the current background is in.", "link": "https://extensions.gnome.org/extension/4096/change-desktop-background-when-workspace-empty/", "shell_version_map": {"38": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "13", "sha256": "02q14rccib29cyb4ln60grcbfkqq0lzsahns1v602pp4ab0hgwb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "02q14rccib29cyb4ln60grcbfkqq0lzsahns1v602pp4ab0hgwb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "14", "sha256": "0lfy2dxyw36r7vnyxk541yqbazlc0v65ki5l3x5s32r5fkhx6svs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "0lfy2dxyw36r7vnyxk541yqbazlc0v65ki5l3x5s32r5fkhx6svs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. For GNOME Shell 40+.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {"40": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"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": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"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": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}}} @@ -466,7 +468,7 @@ , {"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="}}} , {"uuid": "gnome-shell-Google-search-provider@MrNinso", "name": "Google Search Provider", "pname": "google-search-provider", "description": "Add Google search to Gnome Shell Search \n TODO: \n - Add google suggestions (For now using duckduckGo suggestions)", "link": "https://extensions.gnome.org/extension/4132/google-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "disable-menu-switching@selfmade.pl", "name": "Disable Menu Switching", "pname": "disable-menu-switching", "description": "Disable changing menu on hover another panel button.", "link": "https://extensions.gnome.org/extension/4133/disable-menu-switching/", "shell_version_map": {"40": {"version": "3", "sha256": "12879vn6knafdcphg3wwbpbram5hrw79v68z9c9d5z4f9k781ksq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "4", "sha256": "0fnzlmr12l8y689p6kclm3yd3b653jl9f1bhhy7652c1b4g515m0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Set conditions to disable the screensaver and auto suspend. Espresso is a fork of the Caffeine extension, and Espresso only supports Gnome 40 and Gnome 41. Please leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "4", "sha256": "1cvbi9yb4iz9178sjf3fppr1c4n8pm345b66njf1ij81qbllm9aw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBjb25kaXRpb25zIHRvIGRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQuIEVzcHJlc3NvIGlzIGEgZm9yayBvZiB0aGUgQ2FmZmVpbmUgZXh0ZW5zaW9uLCBhbmQgRXNwcmVzc28gb25seSBzdXBwb3J0cyBHbm9tZSA0MCBhbmQgR25vbWUgNDEuIFBsZWFzZSBsZWF2ZSBmZWVkYmFjayBvciByZXBvcnQgaXNzdWVzIHRocm91Z2ggdGhlIEV4dGVuc2lvbiBIb21lcGFnZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1lc3ByZXNzbyIsCiAgIm5hbWUiOiAiRXNwcmVzc28iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXNwcmVzc28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1cvbi9yb4iz9178sjf3fppr1c4n8pm345b66njf1ij81qbllm9aw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBjb25kaXRpb25zIHRvIGRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQuIEVzcHJlc3NvIGlzIGEgZm9yayBvZiB0aGUgQ2FmZmVpbmUgZXh0ZW5zaW9uLCBhbmQgRXNwcmVzc28gb25seSBzdXBwb3J0cyBHbm9tZSA0MCBhbmQgR25vbWUgNDEuIFBsZWFzZSBsZWF2ZSBmZWVkYmFjayBvciByZXBvcnQgaXNzdWVzIHRocm91Z2ggdGhlIEV4dGVuc2lvbiBIb21lcGFnZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1lc3ByZXNzbyIsCiAgIm5hbWUiOiAiRXNwcmVzc28iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXNwcmVzc28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Espresso disables the usual auto suspend and screensaver functionality and optionally Night Light with options to show an Espresso icon in the top panel, to enable Espresso when a fullscreen application is running, to restore state across reboots, to provide notifications, to enable Espresso when specific applications are running, or to pause Night Light when Espresso is enabled or only when specific applications are running.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "4", "sha256": "18104n3vn94c6d9gzdhlbqfqrjkn7v4s585incay49ldg91ync2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVzcHJlc3NvIGRpc2FibGVzIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgd2l0aCBvcHRpb25zIHRvIHNob3cgYW4gRXNwcmVzc28gaWNvbiBpbiB0aGUgdG9wIHBhbmVsLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaXMgcnVubmluZywgdG8gcmVzdG9yZSBzdGF0ZSBhY3Jvc3MgcmVib290cywgdG8gcHJvdmlkZSBub3RpZmljYXRpb25zLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBzcGVjaWZpYyBhcHBsaWNhdGlvbnMgYXJlIHJ1bm5pbmcsIG9yIHRvIHBhdXNlIE5pZ2h0IExpZ2h0IHdoZW4gRXNwcmVzc28gaXMgZW5hYmxlZCBvciBvbmx5IHdoZW4gc3BlY2lmaWMgYXBwbGljYXRpb25zIGFyZSBydW5uaW5nLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29hZG11bmtlZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZXNwcmVzc28iLAogICJ1dWlkIjogImVzcHJlc3NvQGNvYWRtdW5rZWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "18104n3vn94c6d9gzdhlbqfqrjkn7v4s585incay49ldg91ync2i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVzcHJlc3NvIGRpc2FibGVzIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgd2l0aCBvcHRpb25zIHRvIHNob3cgYW4gRXNwcmVzc28gaWNvbiBpbiB0aGUgdG9wIHBhbmVsLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaXMgcnVubmluZywgdG8gcmVzdG9yZSBzdGF0ZSBhY3Jvc3MgcmVib290cywgdG8gcHJvdmlkZSBub3RpZmljYXRpb25zLCB0byBlbmFibGUgRXNwcmVzc28gd2hlbiBzcGVjaWZpYyBhcHBsaWNhdGlvbnMgYXJlIHJ1bm5pbmcsIG9yIHRvIHBhdXNlIE5pZ2h0IExpZ2h0IHdoZW4gRXNwcmVzc28gaXMgZW5hYmxlZCBvciBvbmx5IHdoZW4gc3BlY2lmaWMgYXBwbGljYXRpb25zIGFyZSBydW5uaW5nLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29hZG11bmtlZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZXNwcmVzc28iLAogICJ1dWlkIjogImVzcHJlc3NvQGNvYWRtdW5rZWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "salat-dz@salat-dz.com", "name": "Salat Dz", "pname": "salat-dz", "description": "Show next salat using Salat Dz API", "link": "https://extensions.gnome.org/extension/4136/salat-dz/", "shell_version_map": {"38": {"version": "1", "sha256": "1kga5w2yp375h6lj3fmzr1agg43phyj5f45d7hjv04c405d32p8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbmV4dCBzYWxhdCB1c2luZyBTYWxhdCBEeiBBUEkiLAogICJuYW1lIjogIlNhbGF0IER6IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3NhbGF0LnB5dGhvbmFueXdoZXJlLmNvbSIsCiAgInV1aWQiOiAic2FsYXQtZHpAc2FsYXQtZHouY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "user-at-host@cmm.github.com", "name": "Add user@host to top panel", "pname": "add-userhost-to-panel", "description": "Adds user@host to the top panel, on the left.\n\nNothing fancy, no support -- fork at will, the thing is very simple.", "link": "https://extensions.gnome.org/extension/4141/add-userhost-to-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "vertical-overview@RensAlthuis.github.com", "name": "Vertical overview", "pname": "vertical-overview", "description": "Bringing back vertically stacked workspaces", "link": "https://extensions.gnome.org/extension/4144/vertical-overview/", "shell_version_map": {"40": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} @@ -475,7 +477,7 @@ , {"uuid": "alwaysshowworkspacethumbnails@alynx.one", "name": "Always Show Workspace Thumbnails", "pname": "always-show-workspace-thumbnails", "description": "Always show workspace thumbnails even there is only one workspace.", "link": "https://extensions.gnome.org/extension/4156/always-show-workspace-thumbnails/", "shell_version_map": {"40": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41's Overview UI to make it more usable.\n\nChanges:\n- Search textbox is hidden by default and shown only when user begins to type-to-search\n- Scale of workspaces' thumbnails increased 2x\n- Restores wallpaper on workspaces' thumbnails. No more gray background\n- Show workspaces' thumbnails even when there is only one workspace\n- Firefox's PIP (picture in picture) window is now displayed on the overview screen\n\nAll modifications can be disabled in the extension's settings.\n\nATTENTION!\nAfter extension update, gnome-shell restart is required:\nX11: Alt+F2 => r\nWayland: logout => login", "link": "https://extensions.gnome.org/extension/4158/gnome-40-ui-improvements/", "shell_version_map": {"40": {"version": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "monitor-window-switcher@thefungusrocket.com", "name": "Monitor window switcher", "pname": "monitor-window-switcher", "description": "Improves the window switcher on dual (or more) monitor setups", "link": "https://extensions.gnome.org/extension/4164/monitor-window-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard's capabilities. Mouse pointer pressure, clicks and scrolls over the corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions or your own shell commands.\nThis extension is a big collection of actions that lets you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\nSignificant part of available actions are visual adjustments (contrast, brightness, opacity) and color filters (red, green, desaturate, lightness and color inversions) , including correction filters for colorblind users and cb simulation filters for developers.\n\nRestart your Gnome Shell after each update of the extension to load new code, and reload this site to get rid of the error message, before you post a bug report.\nPlease report bugs/issues on GitHub linked below and add output from these two commands:\njournalctl /usr/bin/gnome-shell --since \"2 days ago\" | grep corners-extended\njournalctl /usr/bin/gjs --since \"2 days ago\" | grep corners-extended\n\nkeywords: overview, app grid, command, brightness, contrast, transparent, opacity, color effect, invert lightness, color tint, color blind filter, simulation, desaturate, night lights, dark theme, volume, mute, magnifier, zoom, screen keyboard, reader, large text, force close, kill -9, show desktop, reorder workspace, window thumbnail / preview, looking glass, custom menu, window, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard capabilities.\nMouse pointer pressure, clicks and scrolls over the corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment or your own shell commands.\n\nThis extension is a big collection of actions that lets you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\nSignificant part of available actions are visual adjustments (contrast, brightness, opacity) and color filters (red, green, desaturate, lightness and color inversions) , including correction filters for colorblind users and cb simulation filters for developers.\n\nRestart your Gnome Shell after each update of the extension to load new code, and reload this site to get rid of the error message, before you post a bug report.\nPlease report bugs/issues on GitHub linked below and add output from these two commands:\njournalctl /usr/bin/gnome-shell --since \"2 days ago\" | grep corners-extended\njournalctl /usr/bin/gjs --since \"2 days ago\" | grep corners-extended\n\nkeywords: overview, app grid, command, brightness, contrast, transparent, opacity, color effect, invert lightness, color tint, color blind filter, simulation, desaturate, night lights, dark theme, volume, mute, magnifier, zoom, screen keyboard, reader, large text, force close, kill -9, show desktop, reorder workspace, window thumbnail / preview, looking glass, custom menu, window, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1snd0vdl87dd3h6ri25d585n1nn0dj1rgzny8r9pkqzjpy6fm7f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGxldHMgeW91IG5hdmlnYXRlIGFuZCBjb250cm9sIHRoZSBHbm9tZSBTaGVsbCBlbnZpcm9ubWVudCBhbmQgd2luZG93cyBhbmQgbGF1bmNoIGFwcGxpY2F0aW9ucyBhbmQgc2NyaXB0cyBub3Qgb25seSB0aHJvdWdoIHRoZSBjb3JuZXJzIGFuZCBlZGdlcyBvZiB5b3VyIG1vbml0b3JzLCBidXQgYWxzbyB1c2luZyB0aGUgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cy5cblNpZ25pZmljYW50IHBhcnQgb2YgYXZhaWxhYmxlIGFjdGlvbnMgYXJlIHZpc3VhbCBhZGp1c3RtZW50cyAoY29udHJhc3QsIGJyaWdodG5lc3MsIG9wYWNpdHkpIGFuZCBjb2xvciBmaWx0ZXJzIChyZWQsIGdyZWVuLCBkZXNhdHVyYXRlLCBsaWdodG5lc3MgYW5kIGNvbG9yIGludmVyc2lvbnMpICwgaW5jbHVkaW5nIGNvcnJlY3Rpb24gZmlsdGVycyBmb3IgY29sb3JibGluZCB1c2VycyBhbmQgY2Igc2ltdWxhdGlvbiBmaWx0ZXJzIGZvciBkZXZlbG9wZXJzLlxuXG5SZXN0YXJ0IHlvdXIgR25vbWUgU2hlbGwgYWZ0ZXIgZWFjaCB1cGRhdGUgb2YgdGhlIGV4dGVuc2lvbiB0byBsb2FkIG5ldyBjb2RlLCBhbmQgcmVsb2FkIHRoaXMgc2l0ZSB0byBnZXQgcmlkIG9mIHRoZSBlcnJvciBtZXNzYWdlLCBiZWZvcmUgeW91IHBvc3QgYSBidWcgcmVwb3J0LlxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgbGlua2VkIGJlbG93IGFuZCBhZGQgb3V0cHV0IGZyb20gdGhlc2UgdHdvIGNvbW1hbmRzOlxuam91cm5hbGN0bCAvdXNyL2Jpbi9nbm9tZS1zaGVsbCAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5qb3VybmFsY3RsIC91c3IvYmluL2dqcyAtLXNpbmNlIFwiMiBkYXlzIGFnb1wiIHwgZ3JlcCBjb3JuZXJzLWV4dGVuZGVkXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "hass-gshell@geoph9-on-github", "name": "Home Assistant Extension", "pname": "home-assistant-extension", "description": "A simple gnome shell extension for Home Assistant. Check the README on github for additional help!\n\nMain points:\n- You need to provide the url of your hass, a long live access token obtained from your profile page (on your hass web instance) and the entity ids of the entities you want to have as togglable.\n- In order to add some local temperature/humidity sensor, you may also provide a temperature and/or a humidity entity id (which should match the corresponding ids of your hass instance).", "link": "https://extensions.gnome.org/extension/4170/home-assistant-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "04p2hvxyyc1zv441sv0l1dcxbdvzqp46mii3zvw0nhq8jg5pz8rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "clear-top-bar@superterran.net", "name": "Clear Top Bar", "pname": "clear-top-bar", "description": "Fully transparent topbar, pairs with the zhanghai transparent top bar extension to make bar opaque when window is maximized", "link": "https://extensions.gnome.org/extension/4173/clear-top-bar/", "shell_version_map": {"40": {"version": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "systemd-manager@hardpixel.eu", "name": "Systemd Manager", "pname": "systemd-manager", "description": "Toggle systemd services on/off from a popup menu in the top gnome panel. Can be used to start services like apache2, mysql, postgres. It uses `pkexec' to run `sytemctl'. If you want to start services without entering a password you have to polkit policy file. An example policy file can be found in the github repository.", "link": "https://extensions.gnome.org/extension/4174/systemd-manager/", "shell_version_map": {"38": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -488,7 +490,7 @@ , {"uuid": "private-switcher@dziban.com", "name": "Private Switcher", "pname": "private-switcher", "description": "Simple extension that allows you do have independent app switcher (alt-tab) for each workspace.", "link": "https://extensions.gnome.org/extension/4204/private-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {"40": {"version": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nNow with preference dialog!\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "13", "sha256": "1qs0dgf41b6489wpm5qv7zlswdh73a56fp226vqwy03r554k1plx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1qs0dgf41b6489wpm5qv7zlswdh73a56fp226vqwy03r554k1plx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nNow with preference dialog!\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "gnome-citeurl-search-provider@raindrum.github.io", "name": "Legal Citation Search", "pname": "gnome-citeurl-search-provider", "description": "This extension lets you look up U.S. state and federal laws and court cases by typing citations (like \"42 USC 1983\" or \"U.S. Constitution Art. I, Sec. 3\") into the search bar.\nBy default, the search supports the U.S. Code and federal constitution, as well as nearly all codified state laws and constitutions, among other sources of law. You can also add more types of citation by following the instructions on the GitHub page.", "link": "https://extensions.gnome.org/extension/4225/gnome-citeurl-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "wireless-hid@chlumskyvaclav.gmail.com", "name": "Wireless HID", "pname": "wireless-hid", "description": "This extension shows the battery of the wireless keyboards, mice, and game controllers in percentages and colors. Multiple devices are supported.", "link": "https://extensions.gnome.org/extension/4228/wireless-hid/", "shell_version_map": {"38": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -503,7 +505,7 @@ , {"uuid": "rippleremove@slippinggitty", "name": "Ripple Remove", "pname": "ripple-remove", "description": "Removes the ripple effect from the Activities hot corner", "link": "https://extensions.gnome.org/extension/4264/ripple-remove/", "shell_version_map": {"40": {"version": "1", "sha256": "1dnk8nfnv5hp8c11fzhn5vscicij4lk9i1vz25fz6sjc3rn1a9pq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlIHJpcHBsZSBlZmZlY3QgZnJvbSB0aGUgQWN0aXZpdGllcyBob3QgY29ybmVyIiwKICAibmFtZSI6ICJSaXBwbGUgUmVtb3ZlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5zbGlwcGluZ2l0dHkucmlwcGxlcmVtb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyaXBwbGVyZW1vdmVAc2xpcHBpbmdnaXR0eSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quickmenu@slippinggitty", "name": "Quick Menu [DEAD]", "pname": "quick-menu", "description": "This is a fork of fedoramenu (which is a fork of Big Sur Menu by fausto) that scrubs references of Fedora by replacing the icon with the GNOME logo.\n\nQuick Menu is a panel applet similar to the Apple menu found on macOS.\n\nEDIT: This extension's purpose is dead. Check out Tofu Menu, which is fedoramenu, but with the ability to change the icon. https://extensions.gnome.org/extension/4272/tofu-menu/", "link": "https://extensions.gnome.org/extension/4266/quick-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1qla029n79366a7xvg2d9v0wa7272bqj40ggvbjrfsbd8x066aca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBmb3JrIG9mIGZlZG9yYW1lbnUgKHdoaWNoIGlzIGEgZm9yayBvZiBCaWcgU3VyIE1lbnUgYnkgZmF1c3RvKSB0aGF0IHNjcnVicyByZWZlcmVuY2VzIG9mIEZlZG9yYSBieSByZXBsYWNpbmcgdGhlIGljb24gd2l0aCB0aGUgR05PTUUgbG9nby5cblxuUXVpY2sgTWVudSBpcyBhIHBhbmVsIGFwcGxldCBzaW1pbGFyIHRvIHRoZSBBcHBsZSBtZW51IGZvdW5kIG9uIG1hY09TLlxuXG5FRElUOiBUaGlzIGV4dGVuc2lvbidzIHB1cnBvc2UgaXMgZGVhZC4gQ2hlY2sgb3V0IFRvZnUgTWVudSwgd2hpY2ggaXMgZmVkb3JhbWVudSwgYnV0IHdpdGggdGhlIGFiaWxpdHkgdG8gY2hhbmdlIHRoZSBpY29uLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjcyL3RvZnUtbWVudS8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWljay1tZW51IiwKICAibmFtZSI6ICJRdWljayBNZW51IFtERUFEXSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuc2xpcHBpbmdpdHR5LnF1aWNrLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2xpcHBpbmdHaXR0eS9xdWlja21lbnUiLAogICJ1dWlkIjogInF1aWNrbWVudUBzbGlwcGluZ2dpdHR5IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "show-desktop-applet@valent-in", "name": "Show Desktop Applet", "pname": "show-desktop-applet", "description": "Minimize/unminimize all open windows with a single click.\n\nForked from https://extensions.gnome.org/extension/1194/show-desktop-button/\n\nFeatures:\n- Windows-like behavior\n- Can be placed at the end of panel\n- Hotkey support (can be activated in settings)", "link": "https://extensions.gnome.org/extension/4267/show-desktop-applet/", "shell_version_map": {"38": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "18", "sha256": "0i31551jnjypj4dyhnfn37f353if1sxxnlfx1jnf20wlbhpr3hz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "18", "sha256": "0i31551jnjypj4dyhnfn37f353if1sxxnlfx1jnf20wlbhpr3hz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0i31551jnjypj4dyhnfn37f353if1sxxnlfx1jnf20wlbhpr3hz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} +, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "19", "sha256": "00j9s61g8p5llsx917p57nmjmg064ly2nl5rzzl8xr5g73mcck80", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "00j9s61g8p5llsx917p57nmjmg064ly2nl5rzzl8xr5g73mcck80", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "00j9s61g8p5llsx917p57nmjmg064ly2nl5rzzl8xr5g73mcck80", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "tofumenu@tofu", "name": "Tofu Menu", "pname": "tofu-menu", "description": "Quick access menu for the GNOME panel with options that help ease the workflow for newcomers and power users alike.\n\nhttps://github.com/tofutech/tofumenu", "link": "https://extensions.gnome.org/extension/4272/tofu-menu/", "shell_version_map": {"40": {"version": "2", "sha256": "05ndbjvvz0v1y8iq6ngqylz4z1ld6q5ibhkr5dh24wqc4wiky30v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyBtZW51IGZvciB0aGUgR05PTUUgcGFuZWwgd2l0aCBvcHRpb25zIHRoYXQgaGVscCBlYXNlIHRoZSB3b3JrZmxvdyBmb3IgbmV3Y29tZXJzIGFuZCBwb3dlciB1c2VycyBhbGlrZS5cblxuaHR0cHM6Ly9naXRodWIuY29tL3RvZnV0ZWNoL3RvZnVtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmVkb3JhLW1lbnUiLAogICJuYW1lIjogIlRvZnUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcudG9mdS5mZWRvcmEtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9mdW1lbnVAdG9mdSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "cryptostash@filidorwiese.nl", "name": "CryptoStash", "pname": "cryptostash", "description": "Keep an eye on the real time value of your crypto coins collections.\n\nYou can create multiple \"stashes\" (portfolios) of coins and monitor the accumulated value in USD or EUR. Or if you prefer, you can simply track the current value of your favorite coin.", "link": "https://extensions.gnome.org/extension/4276/cryptostash/", "shell_version_map": {"38": {"version": "4", "sha256": "0n1452ky1dppcxazgqxv5jc91l4piwp64rmc9b41ak3792j1sgbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcl91cmwiOiAiaHR0cHM6Ly9maWxpZG9yd2llc2UubmwiLAogICJkZXNjcmlwdGlvbiI6ICJLZWVwIGFuIGV5ZSBvbiB0aGUgcmVhbCB0aW1lIHZhbHVlIG9mIHlvdXIgY3J5cHRvIGNvaW5zIGNvbGxlY3Rpb25zLlxuXG5Zb3UgY2FuIGNyZWF0ZSBtdWx0aXBsZSBcInN0YXNoZXNcIiAocG9ydGZvbGlvcykgb2YgY29pbnMgYW5kIG1vbml0b3IgdGhlIGFjY3VtdWxhdGVkIHZhbHVlIGluIFVTRCBvciBFVVIuIE9yIGlmIHlvdSBwcmVmZXIsIHlvdSBjYW4gc2ltcGx5IHRyYWNrIHRoZSBjdXJyZW50IHZhbHVlIG9mIHlvdXIgZmF2b3JpdGUgY29pbi4iLAogICJuYW1lIjogIkNyeXB0b1N0YXNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by1zdGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ0YWciOiAxLjMsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaWRvcndpZXNlL2dub21lLXNoZWxsLWNyeXB0by1zdGFzaCIsCiAgInV1aWQiOiAiY3J5cHRvc3Rhc2hAZmlsaWRvcndpZXNlLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "xmlfix@pwall.github.com", "name": "XML-Fix", "pname": "xml-fix", "description": "Fixes the XML-Codes displaying instead of the characters on notifications.", "link": "https://extensions.gnome.org/extension/4279/xml-fix/", "shell_version_map": {"38": {"version": "2", "sha256": "1c9qa3ky873hkckylsbv0s7q9bmsnia7h8mlc36i7xz7h1ml6fpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeGVzIHRoZSBYTUwtQ29kZXMgZGlzcGxheWluZyBpbnN0ZWFkIG9mIHRoZSBjaGFyYWN0ZXJzIG9uIG5vdGlmaWNhdGlvbnMuIiwKICAibmFtZSI6ICJYTUwtRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFdhbGwyMjIyL1hNTEZpeCIsCiAgInV1aWQiOiAieG1sZml4QHB3YWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} @@ -515,7 +517,7 @@ , {"uuid": "spindown-harddisk@johannes.bittner.gmail.com", "name": "Spin down hard disk", "pname": "spin-down-hard-disk", "description": "Spins down the hard disk (and keeps it spun down)", "link": "https://extensions.gnome.org/extension/4299/spin-down-hard-disk/", "shell_version_map": {"38": {"version": "2", "sha256": "0cfjjbfk7rbj9dsy56sq8ga6i5wkz5p3xqbykxv16xbhgh4i2n01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwaW5zIGRvd24gdGhlIGhhcmQgZGlzayAoYW5kIGtlZXBzIGl0IHNwdW4gZG93bikiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGluZG93bi1oYXJkZGlzayIsCiAgIm5hbWUiOiAiU3BpbiBkb3duIGhhcmQgZGlzayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGluZG93bi1oYXJkZGlzayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3BpbmRvd24taGFyZGRpc2tAam9oYW5uZXMuYml0dG5lci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0cfjjbfk7rbj9dsy56sq8ga6i5wkz5p3xqbykxv16xbhgh4i2n01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwaW5zIGRvd24gdGhlIGhhcmQgZGlzayAoYW5kIGtlZXBzIGl0IHNwdW4gZG93bikiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGluZG93bi1oYXJkZGlzayIsCiAgIm5hbWUiOiAiU3BpbiBkb3duIGhhcmQgZGlzayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGluZG93bi1oYXJkZGlzayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3BpbmRvd24taGFyZGRpc2tAam9oYW5uZXMuYml0dG5lci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "user-pics@comfy", "name": "User Pics", "pname": "user-pics", "description": "lucasalveslm's User Account Image for gnome-shell 3.38", "link": "https://extensions.gnome.org/extension/4301/user-pics/", "shell_version_map": {"38": {"version": "3", "sha256": "1rv6x551dm3hynfkm291b4c552j9d6q89ixmrq0x97xgw75n14fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImx1Y2FzYWx2ZXNsbSdzIFVzZXIgQWNjb3VudCBJbWFnZSBmb3IgZ25vbWUtc2hlbGwgMy4zOCIsCiAgIm5hbWUiOiAiVXNlciBQaWNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItcGljc0Bjb21meSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "screendarker@yingshaoxo.github.com", "name": "Screen Darker", "pname": "screen-darker", "description": "Help you do a switch between a darker screen and brighter screen by one click.", "link": "https://extensions.gnome.org/extension/4304/screen-darker/", "shell_version_map": {"38": {"version": "1", "sha256": "1zlncw0y5crq6n0slhq1f9npzvkkcyh0187z88mzycr55nl4rsx8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHAgeW91IGRvIGEgc3dpdGNoIGJldHdlZW4gYSBkYXJrZXIgc2NyZWVuIGFuZCBicmlnaHRlciBzY3JlZW4gYnkgb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2NyZWVuIERhcmtlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbmdzaGFveG8vZ25vbWUtc2hlbGwtc2NyZWVuLWRhcmtlciIsCiAgInV1aWQiOiAic2NyZWVuZGFya2VyQHlpbmdzaGFveG8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "umi-coin-rate@exposedcat", "name": "UMI Coin Rate", "pname": "umi-coin-rate", "description": "Add UMI coin rate to the panel", "link": "https://extensions.gnome.org/extension/4307/umi-coin-rate/", "shell_version_map": {"38": {"version": "5", "sha256": "13fh82kwma7qdis6ny0c5bw9fxx103p6mj2434fsgfra3d1k8aqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBVTUkgY29pbiByYXRlIHRvIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3VtaS1jb2luLXJhdGUiLAogICJ1dWlkIjogInVtaS1jb2luLXJhdGVAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "13fh82kwma7qdis6ny0c5bw9fxx103p6mj2434fsgfra3d1k8aqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBVTUkgY29pbiByYXRlIHRvIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3VtaS1jb2luLXJhdGUiLAogICJ1dWlkIjogInVtaS1jb2luLXJhdGVAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "umi-coin-rate@exposedcat", "name": "UMI Coin Rate [Unmaintained]", "pname": "umi-coin-rate", "description": "", "link": "https://extensions.gnome.org/extension/4307/umi-coin-rate/", "shell_version_map": {"38": {"version": "5", "sha256": "0rhprnxnsmy834lkc2vmp0zgbj1ngc3bq7m3yac4vd3g40r015nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSBbVW5tYWludGFpbmVkXSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidW1pLWNvaW4tcmF0ZUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0rhprnxnsmy834lkc2vmp0zgbj1ngc3bq7m3yac4vd3g40r015nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSBbVW5tYWludGFpbmVkXSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidW1pLWNvaW4tcmF0ZUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "network-stats@gnome.noroadsleft.xyz", "name": "Network Stats", "pname": "network-stats", "description": "Displays internet upload speed, download speed, bandwidth, data usage. \n\n visit github page for instructions, suggestions and feature requests. \n\n ERROR while updating extension ? restart your system or reload gnome shell. Alt + F2 then r + Enter", "link": "https://extensions.gnome.org/extension/4308/network-stats/", "shell_version_map": {"38": {"version": "10", "sha256": "1kmbaja0nhqjayjcy6rnm2wqzv1gw3divd7d15nanbh0igmwm32a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "1kmbaja0nhqjayjcy6rnm2wqzv1gw3divd7d15nanbh0igmwm32a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {"40": {"version": "1", "sha256": "1jas7pcn3a28fnfs3azrbiqf22gx337js6if8v8vsb15994pbak6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JlZW4tbG9jayIsCiAgIm5hbWUiOiAiU2NyZWVuIGxvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuLWxvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2F3eWVyMTMvc2NyZWVuLWxvY2siLAogICJ1dWlkIjogInNjcmVlbi1sb2NrQGdhcmNpYWJhYW1laXJvLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "force-show-osk@bruh.ltd", "name": "Force Show OSK", "pname": "force-show-osk", "description": "Show the on-screen keyboard regardless of whether the touch mode is enabled", "link": "https://extensions.gnome.org/extension/4316/force-show-osk/", "shell_version_map": {"40": {"version": "3", "sha256": "0p2v36bliaa6i85b4r0g38ih9fidn95dwmyhc3dygvynjzvvv56b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tpcmJ5a2V2aW5zb24vZm9yY2Utc2hvdy1vc2siLAogICJ1dWlkIjogImZvcmNlLXNob3ctb3NrQGJydWgubHRkIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0p2v36bliaa6i85b4r0g38ih9fidn95dwmyhc3dygvynjzvvv56b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tpcmJ5a2V2aW5zb24vZm9yY2Utc2hvdy1vc2siLAogICJ1dWlkIjogImZvcmNlLXNob3ctb3NrQGJydWgubHRkIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -532,7 +534,7 @@ , {"uuid": "fluoroom-gnome-top-bar@fluoroom.github.com", "name": "fluoroom's Top Bar", "pname": "fluorooms-top-bar", "description": "Persistent top bar based on Gnome's default style, with some modifications.\n\nThis extension makes black background and screen corners persistent and makes buttons round, but it will respect your current theme's fonts, margins and icons.", "link": "https://extensions.gnome.org/extension/4350/fluorooms-top-bar/", "shell_version_map": {"40": {"version": "4", "sha256": "1gm6ijr66nrs4r7cp2ksdy4sppf3vrg88lvf1gs993q6r894li89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNpc3RlbnQgdG9wIGJhciBiYXNlZCBvbiBHbm9tZSdzIGRlZmF1bHQgc3R5bGUsIHdpdGggc29tZSBtb2RpZmljYXRpb25zLlxuXG5UaGlzIGV4dGVuc2lvbiBtYWtlcyBibGFjayBiYWNrZ3JvdW5kIGFuZCBzY3JlZW4gY29ybmVycyBwZXJzaXN0ZW50IGFuZCBtYWtlcyBidXR0b25zIHJvdW5kLCBidXQgaXQgd2lsbCByZXNwZWN0IHlvdXIgY3VycmVudCB0aGVtZSdzIGZvbnRzLCBtYXJnaW5zIGFuZCBpY29ucy4iLAogICJuYW1lIjogImZsdW9yb29tJ3MgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbHVvcm9vbS9mbHVvcm9vbS1nbm9tZS10b3AtYmFyIiwKICAidXVpZCI6ICJmbHVvcm9vbS1nbm9tZS10b3AtYmFyQGZsdW9yb29tLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "mbpbat@prithvivishak.gmail.com", "name": "MacBook Battery Percentage Corrector", "pname": "macbook-battery-percentage-corrector", "description": "Corrects only the battery percentage shown in the panel aggregate menu.\nDoes not mess with UPower or other subsystems. Special thanks to @andenlol.", "link": "https://extensions.gnome.org/extension/4353/macbook-battery-percentage-corrector/", "shell_version_map": {"38": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.\nThis extension required Gnome Shell version 40.\nOrganize the items by going into the extensions settings.\n\n!!! Please make sure you're fully on Gnome 40 / you're using a distribution, which is fully on Gnome 40, since otherwise this extension might not work correctly. This was the case for Manjaro Stable until recently and is probably the case for Ubuntu 21.04 right now. !!!", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "121a8r063ifv4lv5s07pglxj4h90n3lp6f0jyw4lnbg38v0nqv28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci5cblRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVkIEdub21lIFNoZWxsIHZlcnNpb24gNDAuXG5Pcmdhbml6ZSB0aGUgaXRlbXMgYnkgZ29pbmcgaW50byB0aGUgZXh0ZW5zaW9ucyBzZXR0aW5ncy5cblxuISEhIFBsZWFzZSBtYWtlIHN1cmUgeW91J3JlIGZ1bGx5IG9uIEdub21lIDQwIC8geW91J3JlIHVzaW5nIGEgZGlzdHJpYnV0aW9uLCB3aGljaCBpcyBmdWxseSBvbiBHbm9tZSA0MCwgc2luY2Ugb3RoZXJ3aXNlIHRoaXMgZXh0ZW5zaW9uIG1pZ2h0IG5vdCB3b3JrIGNvcnJlY3RseS4gVGhpcyB3YXMgdGhlIGNhc2UgZm9yIE1hbmphcm8gU3RhYmxlIHVudGlsIHJlY2VudGx5IGFuZCBpcyBwcm9iYWJseSB0aGUgY2FzZSBmb3IgVWJ1bnR1IDIxLjA0IHJpZ2h0IG5vdy4gISEhIiwKICAibmFtZSI6ICJUb3AgQmFyIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3AtYmFyLW9yZ2FuaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "6", "sha256": "04vlmrwlv58ps3v0flc2m8l18q52kz3yyk6yh9i543aiknprm40x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "04vlmrwlv58ps3v0flc2m8l18q52kz3yyk6yh9i543aiknprm40x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {"38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {"40": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "ShutdownTimer@deminder", "name": "Shutdown Timer", "pname": "shutdowntimer", "description": "Shutdown/reboot/suspend the device after a specific time or wake with a rtc alarm.\n\nThe screen saver will not interrupt the timer. A privileged control script may be installed to control shutdown and rtcwake as user. Additionally, a check command may be configured before shutdown.", "link": "https://extensions.gnome.org/extension/4372/shutdowntimer/", "shell_version_map": {"38": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} @@ -548,11 +550,11 @@ , {"uuid": "print-website@ermeso.com", "name": "Print Website", "pname": "print-website", "description": "A extension for print websites.", "link": "https://extensions.gnome.org/extension/4404/print-website/", "shell_version_map": {"40": {"version": "9", "sha256": "1cg1awvfyhhc7ri7vppsjr28c1zwgw9rasyv1jcclgxr558n3n6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZXh0ZW5zaW9uIGZvciBwcmludCB3ZWJzaXRlcy4iLAogICJuYW1lIjogIlByaW50IFdlYnNpdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXJtZXNvbnNhbXBhaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50LXdlYnNpdGUiLAogICJ1dWlkIjogInByaW50LXdlYnNpdGVAZXJtZXNvLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "replaceActivitiesText@pratap.fastmail.fm", "name": "Replace Activities Text", "pname": "replace-activities-text", "description": "A Simple Extension to Change 'Activities' Label with Logo and Text.\nYou can Keep Either\n1. Logo or\n2. Text or\n3. Both or\n4. None at all", "link": "https://extensions.gnome.org/extension/4405/replace-activities-text/", "shell_version_map": {"38": {"version": "8", "sha256": "04adx4043d3ni510h44pi3gr0k15a4n0zwr4k5fxisr4yjl1510w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9BY3Rpdml0aWVzVGV4dCIsCiAgInV1aWQiOiAicmVwbGFjZUFjdGl2aXRpZXNUZXh0QHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"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": "5", "sha256": "1z1k9908ajm7r52v1x4i633q2lk8w4m967h078lbdd5i8dzvgybb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1z1k9908ajm7r52v1x4i633q2lk8w4m967h078lbdd5i8dzvgybb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"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": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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-Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, VIM navigation hotkeys, window 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 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, windows, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch windows", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"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": "1", "sha256": "0sz69rs6z1fybva20xs8587bs4xaflb4frd14d729lqq5h1m8b2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVwZTM4Ni9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJmZWRvcmEtdXBkYXRlQHBlcGUzODYiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "11", "sha256": "1f42l7rh182rh3gkxfkpisvalr5mpn9dfm9sai5mjq0bk0rzap0x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1f42l7rh182rh3gkxfkpisvalr5mpn9dfm9sai5mjq0bk0rzap0x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "12", "sha256": "1xqiainrvipkw2yrzihvbghbshrw0bcxx2wc3wqaxxfa04ziiv7s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1xqiainrvipkw2yrzihvbghbshrw0bcxx2wc3wqaxxfa04ziiv7s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1cGFudGFuby9yZWFkaW5nc3RyaXAiLAogICJ1dWlkIjogInJlYWRpbmdzdHJpcEBsdXBhbnRhbm8uZ2lodGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"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": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \n\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "typewriter-kb@zzzheka97.gmail.com", "name": "Typewriter Keyboard", "pname": "typewriter-keyboard", "description": "Add a typewriter effect to your keyboard.\n \nThis extension is based on typewriter-kb application \n(https://github.com/ZhekehZ/linux-typewriter-kb), which \nis required to run the extension, but is not part of it.\n \n-------------------------------------------\nIcons made by Freepik from www.flaticon.com", "link": "https://extensions.gnome.org/extension/4427/typewriter-keyboard/", "shell_version_map": {"38": {"version": "2", "sha256": "1zmlmijkm6sgpp00qbrwnxmd4q5dfh07g9w9nynq3ciwxs9fjnai", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -566,11 +568,11 @@ , {"uuid": "expandable-notifications@kaan.g.inam.org", "name": "Expandable Notifications", "pname": "expandable-notifications", "description": "Makes the notifications in the notification list expandable. Using gsettings, you can choose between three modes: AUTO, ARROW and CRITICAL.\n\nAUTO will expand the notifications in the notification list automatically. \nARROW adds an arrow that lets you choose what to expand or unexpand. \nCRITICAL is similar to arrow, but expands notifications with the urgency critical automatically. \n\nFor more information and an example command to change the mode, I recommend to look at the repository.\"\n\nThe old repository has been deleted, however I reposted the extension on GitHub.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "orange-share@Yannis4444.github.com", "name": "Orange Share", "pname": "orange-share", "description": "A small python server that accepts requests from an apple shortcut to allow sharing all sorts of media from iOS. It allows sending content right from the share sheet - similar to AirDrop between Apple Devices", "link": "https://extensions.gnome.org/extension/4469/orange-share/", "shell_version_map": {"40": {"version": "7", "sha256": "14xc3j2k6fjh0nif22j3q0xk52ba2qpj96rq80g6cv3cyy8ihi2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgcHl0aG9uIHNlcnZlciB0aGF0IGFjY2VwdHMgcmVxdWVzdHMgZnJvbSBhbiBhcHBsZSBzaG9ydGN1dCB0byBhbGxvdyBzaGFyaW5nIGFsbCBzb3J0cyBvZiBtZWRpYSBmcm9tIGlPUy4gSXQgYWxsb3dzIHNlbmRpbmcgY29udGVudCByaWdodCBmcm9tIHRoZSBzaGFyZSBzaGVldCAtIHNpbWlsYXIgdG8gQWlyRHJvcCBiZXR3ZWVuIEFwcGxlIERldmljZXMiLAogICJuYW1lIjogIk9yYW5nZSBTaGFyZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ZYW5uaXM0NDQ0L09yYW5nZS1TaGFyZS8iLAogICJ1dWlkIjogIm9yYW5nZS1zaGFyZUBZYW5uaXM0NDQ0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mediacontrols@cliffniff.github.com", "name": "Media Controls", "pname": "media-controls", "description": "Show controls and information of the currently playing media in the panel.\n\n - Highly customizable\n - Support GNOME 3.36(beta) , 3.38, 40, 41\n - Caches album art\n - Control every element in the extension", "link": "https://extensions.gnome.org/extension/4470/media-controls/", "shell_version_map": {"38": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a simple label to the panel that shows currently playing song on Spotify, nothing more", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a simple label to the panel that shows currently playing song or podcast on Spotify, nothing more", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "0mal1290kdvqv60m0ps42hnx801knh5vd4mlwg1z7ydj9sw31cfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "hide-panel-for-fullscreen-windows-only@github.freder", "name": "Hide panel (only when active window is fullscreen)", "pname": "hide-panel-only-when-active-window-is-fullscreen", "description": "hide top panel only when a fullscreen application has focus", "link": "https://extensions.gnome.org/extension/4475/hide-panel-only-when-active-window-is-fullscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "1hd5agdjq73qiqip0m3grmlxk8klp26pd71cz555414mi3f9mww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGUgdG9wIHBhbmVsIG9ubHkgd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaGFzIGZvY3VzIiwKICAibmFtZSI6ICJIaWRlIHBhbmVsIChvbmx5IHdoZW4gYWN0aXZlIHdpbmRvdyBpcyBmdWxsc2NyZWVuKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZXIvaGlkZS1wYW5lbC1mb3ItZnVsbHNjcmVlbi13aW5kb3dzLW9ubHkiLAogICJ1dWlkIjogImhpZGUtcGFuZWwtZm9yLWZ1bGxzY3JlZW4td2luZG93cy1vbmx5QGdpdGh1Yi5mcmVkZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "netspeed@alynx.one", "name": "Net Speed", "pname": "net-speed", "description": "Show current net speed on panel.", "link": "https://extensions.gnome.org/extension/4478/net-speed/", "shell_version_map": {"40": {"version": "2", "sha256": "0j48ai7nqkpr0ymypsicdp7nw59hx9rgya8qws58wx56q9bznl69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5ldHNwZWVkQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nMAJOR CHANGES\n\n - New Tabbed Tiling Implementation via St.Widget.\n - New style declarations will reset the custom stylesheets for users when updating. Old styles will be backed up as $HOME/.config/forge/stylesheet/forge/stylesheet.css.bak.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "0hniflq2x8b1cwh5imlwbbmb703jd46w8828xng6gbw966l093cf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "40": {"version": "43", "sha256": "07qa8rlh9rls0hfqylzh7ivdn5s01lrbvh4kva620sw7qcr14l1j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "07qa8rlh9rls0hfqylzh7ivdn5s01lrbvh4kva620sw7qcr14l1j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} +, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nMAJOR CHANGES\n\n - New Tabbed Tiling Implementation via St.Widget.\n - New style declarations will reset the custom stylesheets for users when updating. Old styles will be backed up as $HOME/.config/forge/stylesheet/forge/stylesheet.css.bak.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "0hniflq2x8b1cwh5imlwbbmb703jd46w8828xng6gbw966l093cf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "40": {"version": "44", "sha256": "138nmvjlpc2gszbnav5kp649mhhp7fhk9c4y9jqlsc7rzjcy7kzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "44", "sha256": "138nmvjlpc2gszbnav5kp649mhhp7fhk9c4y9jqlsc7rzjcy7kzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"uuid": "autonightlight@zefty.github.io", "name": "Auto Night Light", "pname": "auto-night-light", "description": "Automatically adjust night light", "link": "https://extensions.gnome.org/extension/4482/auto-night-light/", "shell_version_map": {"38": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "favourites-in-appgrid@harshadgavali.gitlab.org", "name": "Favourites in AppGrid", "pname": "favourites-in-appgrid", "description": "Keep favourite applications in AppGrid", "link": "https://extensions.gnome.org/extension/4485/favourites-in-appgrid/", "shell_version_map": {"40": {"version": "1", "sha256": "1zcbs36kcmw50wgxkqn22abh8g1nx17p48vbpzk5x2842mn8shaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2hhcnNoYWRnYXZhbGkvZmF2b3VyaXRlcy1pbi1hcHBncmlkLyIsCiAgInV1aWQiOiAiZmF2b3VyaXRlcy1pbi1hcHBncmlkQGhhcnNoYWRnYXZhbGkuZ2l0bGFiLm9yZyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1zcbs36kcmw50wgxkqn22abh8g1nx17p48vbpzk5x2842mn8shaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2hhcnNoYWRnYXZhbGkvZmF2b3VyaXRlcy1pbi1hcHBncmlkLyIsCiAgInV1aWQiOiAiZmF2b3VyaXRlcy1pbi1hcHBncmlkQGhhcnNoYWRnYXZhbGkuZ2l0bGFiLm9yZyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"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": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -586,7 +588,7 @@ , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted\n\nI'm not interested in the fact my output audio device is muted: this is how it's supposed to be. But if it's unmuted, then I want to see the icon.\n\nExcept when the mic is on, then I'm probably in a call, frantically figuring out what's wrong.", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "1", "sha256": "1kiki2gks6jvngx62jz1mdg3xpi4npc4sv9v4mc7fz4s91ibsykr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZFxuXG5JJ20gbm90IGludGVyZXN0ZWQgaW4gdGhlIGZhY3QgbXkgb3V0cHV0IGF1ZGlvIGRldmljZSBpcyBtdXRlZDogdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZS4gQnV0IGlmIGl0J3MgdW5tdXRlZCwgdGhlbiBJIHdhbnQgdG8gc2VlIHRoZSBpY29uLlxuXG5FeGNlcHQgd2hlbiB0aGUgbWljIGlzIG9uLCB0aGVuIEknbSBwcm9iYWJseSBpbiBhIGNhbGwsIGZyYW50aWNhbGx5IGZpZ3VyaW5nIG91dCB3aGF0J3Mgd3JvbmcuIiwKICAibmFtZSI6ICJBdXRvaGlkZSBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {"38": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "dell-command-configure-menu@vsimkus.github.io", "name": "Dell Command Configure menu", "pname": "dell-command-configure-menu", "description": "Adds submenu in gnome top-bar to access Dell Command Configure options.\n\nCurrently, only battery charge settings are implemented.\n\nThe Dell Command Configure tool must be installed separately from Dell https://www.dell.com/support/kbdoc/en-uk/000178000/dell-command-configure#Downloads.", "link": "https://extensions.gnome.org/extension/4545/dell-command-configure-menu/", "shell_version_map": {"38": {"version": "3", "sha256": "1hy4fhmj076xkjas49q6ls9b9nyg5pzca95094zx1kpbr75vs2k7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "6", "sha256": "0994j96sppbirsg6d740n30zfv2n7qrpzl36xmj977y4p4fm1l3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0994j96sppbirsg6d740n30zfv2n7qrpzl36xmj977y4p4fm1l3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSB0b3AtYmFyIHRvIGFjY2VzcyBEZWxsIENvbW1hbmQgQ29uZmlndXJlIG9wdGlvbnMuXG5cbkN1cnJlbnRseSwgb25seSBiYXR0ZXJ5IGNoYXJnZSBzZXR0aW5ncyBhcmUgaW1wbGVtZW50ZWQuXG5cblRoZSBEZWxsIENvbW1hbmQgQ29uZmlndXJlIHRvb2wgbXVzdCBiZSBpbnN0YWxsZWQgc2VwYXJhdGVseSBmcm9tIERlbGwgaHR0cHM6Ly93d3cuZGVsbC5jb20vc3VwcG9ydC9rYmRvYy9lbi11ay8wMDAxNzgwMDAvZGVsbC1jb21tYW5kLWNvbmZpZ3VyZSNEb3dubG9hZHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAibmFtZSI6ICJEZWxsIENvbW1hbmQgQ29uZmlndXJlIG1lbnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVsbGNvbW1hbmRjb25maWd1cmVtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92c2lta3VzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnUiLAogICJ1dWlkIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudUB2c2lta3VzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "12", "sha256": "0192ypk5343girmbr9fyadbj4axqwwqc1zq66dgambdrdnxprr3h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0192ypk5343girmbr9fyadbj4axqwwqc1zq66dgambdrdnxprr3h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0192ypk5343girmbr9fyadbj4axqwwqc1zq66dgambdrdnxprr3h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "15y30c61a751rcx0gfzn80nidzm1y6xdkrssnpgnjq9xj8wf516s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "killapp@adam.gadmz", "name": "Kill App", "pname": "kill-app", "description": "Force quit or kill application", "link": "https://extensions.gnome.org/extension/4551/kill-app/", "shell_version_map": {"38": {"version": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "hotkeys-popup@pimsnel.com", "name": "Hotkeys Popup", "pname": "hotkeys-popup", "description": "Pop-up cheatsheet with currently configured keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4553/hotkeys-popup/", "shell_version_map": {"40": {"version": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "inotch@alynx.one", "name": "iNotch", "pname": "inotch", "description": "Add a useless notch to your screen.", "link": "https://extensions.gnome.org/extension/4556/inotch/", "shell_version_map": {"40": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -611,7 +613,7 @@ , {"uuid": "alphatint@saifulbkhan.github.com", "name": "AlphaTint", "pname": "alphatint", "description": "Artificially reduce brightness of your displays (including external monitors).\n\nIt is a fork of ColorTint modified to reduce brightness without an alpha channel.", "link": "https://extensions.gnome.org/extension/4624/alphatint/", "shell_version_map": {"40": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "focus-changer@heartmire", "name": "Focus changer", "pname": "focus-changer", "description": "Change focus between windows in all directions.\n\nThe extension will first try to find a suitable window within the same monitor. If there is none, it will try to find one on the next monitor in that direction (in a multi-monitor setup).\n\nDefault shortcuts (can be changed in preferences):\n+h = Focus left\n+j = Focus down\n+k = Focus up\n+l = Focus right", "link": "https://extensions.gnome.org/extension/4627/focus-changer/", "shell_version_map": {"38": {"version": "9", "sha256": "0ngn0bw0f2fpp0vv4hq7gb0vx2xq2gk3nkkb6p393i9qbr42l3y1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "8", "sha256": "0lcws0mgf72pl8q9q4finfkkzxic22f6gfljfkv5yghl8v1ksv06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0lcws0mgf72pl8q9q4finfkkzxic22f6gfljfkv5yghl8v1ksv06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "no-titlebar-when-maximized@alec.ninja", "name": "No Titlebar When Maximized", "pname": "no-titlebar-when-maximized", "description": "Hides the classic title bar of maximized X.Org windows", "link": "https://extensions.gnome.org/extension/4630/no-titlebar-when-maximized/", "shell_version_map": {"41": {"version": "4", "sha256": "08vdlmv471b7v0c3h0p2yky7rmrrjrazn3in7qqmfvlp28j3hasl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlY2RvdG5pbmphL25vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkIiwKICAidXVpZCI6ICJuby10aXRsZWJhci13aGVuLW1heGltaXplZEBhbGVjLm5pbmphIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "5", "sha256": "1yxlqbqw1j2gsydfqiz6xqdl6yv6iww90c1l8f1y6601p8979rc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1yxlqbqw1j2gsydfqiz6xqdl6yv6iww90c1l8f1y6601p8979rc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mousefollowsfocus@matthes.biz", "name": "Mouse Follows Focus", "pname": "mouse-follows-focus", "description": "Are you a power-user?\nDo you like using Super+1,2,3 to access your favorite apps?\nAre you annoyed that you have to manually move your mouse between screens because it can't keep up with your keyboard shortcuts?\nThen this extension is for you!\n\nThis simple GNOME shell extension does the opposite of the 'focus follows mouse' setting. It makes the mouse follow your keyboard focus. Whenever you focus a window, if the cursor isn't already in it, it will jump to the windows center, making it easy to interact with it.", "link": "https://extensions.gnome.org/extension/4642/mouse-follows-focus/", "shell_version_map": {"41": {"version": "4", "sha256": "1zsy76sab87s74p30sxdp1cki1w956gm0sw27anpx1z6yih50rdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlb25NYXR0aGVzL21vdXNlZm9sbG93c2ZvY3VzIiwKICAidXVpZCI6ICJtb3VzZWZvbGxvd3Nmb2N1c0BtYXR0aGVzLmJpeiIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "gnome-extension-pass-search-provider.lavrov.github.com", "name": "Pass Search Provider", "pname": "pass-search-provider", "description": "Shows matching pass entries in gnome search", "link": "https://extensions.gnome.org/extension/4645/pass-search-provider/", "shell_version_map": {"40": {"version": "6", "sha256": "06msk4zds1q6jjdw6g7akbsiyfz0avwvydpykcylhhc9ribzsncn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG1hdGNoaW5nIHBhc3MgZW50cmllcyBpbiBnbm9tZSBzZWFyY2giLAogICJuYW1lIjogIlBhc3MgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdnJvdi9nbm9tZS1leHRlbnNpb24tcGFzcy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1wYXNzLXNlYXJjaC1wcm92aWRlci5sYXZyb3YuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} @@ -625,9 +627,9 @@ , {"uuid": "cloudflare-warp-gnome@harshan01", "name": "Cloudflare 1.1.1.1 WARP Switcher", "pname": "cloudflare-1111-warp-switcher", "description": "Unofficial Cloudflare 1.1.1.1 WARP Switcher extension for GNOME shell", "link": "https://extensions.gnome.org/extension/4670/cloudflare-1111-warp-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "0r4m8ga3l31gbi3pxvpnc4w98ik4ixn609hj1nqj3c95f3ld97z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFyc2hhbjAxL0Nsb3VkZmxhcmUtV0FSUC1HTk9NRS1Td2l0Y2hlciIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZS13YXJwLWdub21lQGhhcnNoYW4wMSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0r4m8ga3l31gbi3pxvpnc4w98ik4ixn609hj1nqj3c95f3ld97z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFyc2hhbjAxL0Nsb3VkZmxhcmUtV0FSUC1HTk9NRS1Td2l0Y2hlciIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZS13YXJwLWdub21lQGhhcnNoYW4wMSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "alt-tab-move-mouse@buzztaiki.github.com", "name": "Alt-Tab Move Mouse", "pname": "alt-tab-move-mouse", "description": "Move mouse pointer onto active window after Alt-Tab. This extension is workaround of some sloppy focus problems", "link": "https://extensions.gnome.org/extension/4673/alt-tab-move-mouse/", "shell_version_map": {"40": {"version": "1", "sha256": "0dl2v61v2iqnf1qk7dsi60bm68kk4kc16jbrk9knw4ys8n35bxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXp6dGFpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbW92ZS1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LXRhYi1tb3ZlLW1vdXNlQGJ1enp0YWlraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "0dl2v61v2iqnf1qk7dsi60bm68kk4kc16jbrk9knw4ys8n35bxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXp6dGFpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbW92ZS1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LXRhYi1tb3ZlLW1vdXNlQGJ1enp0YWlraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "Server@sven.kramer", "name": "Server", "pname": "server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed. This extension is only tested with Gnome 40+. Didnt test it yet with older versions.", "link": "https://extensions.gnome.org/extension/4676/server/", "shell_version_map": {"38": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"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": "11", "sha256": "0jmvn4vxcq6bgmfnh82si50kglxqs12b4clg2sc79711mc3ppavr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "0jmvn4vxcq6bgmfnh82si50kglxqs12b4clg2sc79711mc3ppavr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0jmvn4vxcq6bgmfnh82si50kglxqs12b4clg2sc79711mc3ppavr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"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": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"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=="}}} -, {"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": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"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": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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": "7", "sha256": "16csdmbvjcahvkihq3gw4rympyc80jjchf68p1hwvcx338pdx8ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard.\n\nThis extension is meant to be used with a multi-monitor setup with the setting \"Workspaces on primary display only\". It enables quick switching to an application on a given workspace via keyboard by preventing the focus from being restored to a window on a secondary monitor.", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "1", "sha256": "1xllg9wp7phrqa9897m9al740k60v01zird49vwwm24wzpmyby9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBtZWFudCB0byBiZSB1c2VkIHdpdGggYSBtdWx0aS1tb25pdG9yIHNldHVwIHdpdGggdGhlIHNldHRpbmcgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5XCIuIEl0IGVuYWJsZXMgcXVpY2sgc3dpdGNoaW5nIHRvIGFuIGFwcGxpY2F0aW9uIG9uIGEgZ2l2ZW4gd29ya3NwYWNlIHZpYSBrZXlib2FyZCBieSBwcmV2ZW50aW5nIHRoZSBmb2N1cyBmcm9tIGJlaW5nIHJlc3RvcmVkIHRvIGEgd2luZG93IG9uIGEgc2Vjb25kYXJ5IG1vbml0b3IuIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -636,7 +638,7 @@ , {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "22", "sha256": "0hzllcnhrc68l4xw1yg3wvl0jssd51sarbapxs0fjyr8yiz8611z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0hzllcnhrc68l4xw1yg3wvl0jssd51sarbapxs0fjyr8yiz8611z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDIyCn0="}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "A Gnome shell extension to close and save open windows. And restore saved windows. Most importantly, it supports both X11 and Wayland!", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "11", "sha256": "0knj9ix19cly96aj6bp7mai7rb1s8r9bvik8qs3n1f3xy3lx62fb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0knj9ix19cly96aj6bp7mai7rb1s8r9bvik8qs3n1f3xy3lx62fb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close and save open windows. And restore the saved windows. Most importantly, it supports both X11 and Wayland!\n\nFeatures:\n- Close open windows\n- Save open windows\n- Restore saved open windows\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "prevent-double-empty-window@silliewous.nl", "name": "Prevent double empty window", "pname": "prevent-double-empty-window", "description": "Set MIN_NUMBER_WORKSPACES to 1 so there is only one empty workspace when there are no windows open.\n\nhttps://gitlab.com/g3786/prevent-double-empty-window", "link": "https://extensions.gnome.org/extension/4711/prevent-double-empty-window/", "shell_version_map": {"40": {"version": "1", "sha256": "18f1pflvv4sw1r182rrjz2jdy1ym1ipm5lid2sm518h8c3iiabb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Control external displays' brightness and audio volume via DDC. It requires ddcutil to be installed and i2c permissions for non-root users.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups. For those users that like to use the keyboard only with these switchers.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}}} @@ -645,7 +647,7 @@ , {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Add new dbus call for windows to get windows list and some of theirs properties", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"41": {"version": "2", "sha256": "02z265maw4a0rkw5y4an2j7spjqif44nxf47q5qr6cwnvmfpw6ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMiLAogICJuYW1lIjogIldpbmRvdyBDYWxscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2t5aWNreS93aW5kb3ctY2FsbHMiLAogICJ1dWlkIjogIndpbmRvdy1jYWxsc0Bkb21hbmRvbWFuLnh5eiIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search provider for browser tabs\n\nSee following github link for installing browser extension and host app for searches to appear!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "10", "sha256": "04jp82c5ib4dvg1pl3191n5m182x85gyb7pbqmpga4jr608iiczx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiU21hcnQgQXV0byBNb3ZlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImtoaW1hcm9zIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvc21hcnQtYXV0by1tb3ZlLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zbWFydC1hdXRvLW1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: works optimally with \"Static\" as opposed to \"Dynamic\" workspaces.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "13", "sha256": "0437qsi49ylshhf5z5sb15637zldlbb9df8ijqf9mcxbj3igaydg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiB3b3JrcyBvcHRpbWFsbHkgd2l0aCBcIlN0YXRpY1wiIGFzIG9wcG9zZWQgdG8gXCJEeW5hbWljXCIgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIlNtYXJ0IEF1dG8gTW92ZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJraGltYXJvcyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3NtYXJ0LWF1dG8tbW92ZS8iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} @@ -659,17 +661,23 @@ , {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1var5rv8waazr1h40ai4ziwjcnxni8q6w26rqqgvax7wv4dzmyh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Adds an avatar to the panel. Controllability: shades, buttons (turn notifications on/off, sleep, off), visibility of username and hostname", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "6", "sha256": "1yahf80xd5cr318if66xg6lrx6mv3arbfrywd0s71hsdhc19mza5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gYXZhdGFyIHRvIHRoZSBwYW5lbC4gQ29udHJvbGxhYmlsaXR5OiBzaGFkZXMsIGJ1dHRvbnMgKHR1cm4gbm90aWZpY2F0aW9ucyBvbi9vZmYsIHNsZWVwLCBvZmYpLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Adds an avatar to the panel. Controllability: shades, buttons (turn notifications on/off, sleep, off), visibility of username and hostname", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "7", "sha256": "05aff0i241qqcb4v34yhj5v1ihnxmxcvmz46si3b8yk66alzn4fa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gYXZhdGFyIHRvIHRoZSBwYW5lbC4gQ29udHJvbGxhYmlsaXR5OiBzaGFkZXMsIGJ1dHRvbnMgKHR1cm4gbm90aWZpY2F0aW9ucyBvbi9vZmYsIHNsZWVwLCBvZmYpLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "Alt + Mouse control window", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "4", "sha256": "0bysy8nm3g9q86ksds8czpr8444spq8vbc7f8dl4ipm85w53sa0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93IiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0bysy8nm3g9q86ksds8czpr8444spq8vbc7f8dl4ipm85w53sa0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93IiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "workspace-switcher-manager@G-dH.github.com", "name": "Workspace Switcher Manager", "pname": "workspace-switcher-manager", "description": "Customize your workspace switcher behavior and the content, dimensions, position, orientation and colors of its popup.", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "1", "sha256": "02hx1mmk1mbmcjw178al0xl5spncdnjdp5wmrgfd9c9d1hmvs9sh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIFN3aXRjaGVyIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "02hx1mmk1mbmcjw178al0xl5spncdnjdp5wmrgfd9c9d1hmvs9sh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIFN3aXRjaGVyIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "02hx1mmk1mbmcjw178al0xl5spncdnjdp5wmrgfd9c9d1hmvs9sh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIFN3aXRjaGVyIE1hbmFnZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "compare@eexpss.gmail.com", "name": "Copy 2 Compare", "pname": "compare-filedir-from-clip", "description": "Copy two Dirs/Files names from anywhere such as `nautilus` or `gnome-terminal`, and then compare them. Dirs/Files copied to the `CLIPBOARD` can only be used for comparison. Dirs/Files selected to the `PRIMARY` with mouse can be opened by click the menu item. It needs to be copied twice. Only one file or directory can be copied each time, otherwise the copy is invalid. Meld must be installed. The hotkey `ctrl-o` can open the last file selected by the mouse.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {"40": {"version": "6", "sha256": "0j2q9msah4g0xl7jnjcf8bc8lbn3is76577f7qwflhv3j3y7q1j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdHdvIERpcnMvRmlsZXMgbmFtZXMgZnJvbSBhbnl3aGVyZSBzdWNoIGFzIGBuYXV0aWx1c2Agb3IgYGdub21lLXRlcm1pbmFsYCwgYW5kIHRoZW4gY29tcGFyZSB0aGVtLiAgRGlycy9GaWxlcyBjb3BpZWQgdG8gdGhlIGBDTElQQk9BUkRgIGNhbiBvbmx5IGJlIHVzZWQgZm9yIGNvbXBhcmlzb24uIERpcnMvRmlsZXMgc2VsZWN0ZWQgdG8gdGhlIGBQUklNQVJZYCB3aXRoIG1vdXNlIGNhbiBiZSBvcGVuZWQgYnkgY2xpY2sgdGhlIG1lbnUgaXRlbS4gSXQgbmVlZHMgdG8gYmUgY29waWVkIHR3aWNlLiBPbmx5IG9uZSBmaWxlIG9yIGRpcmVjdG9yeSBjYW4gYmUgY29waWVkIGVhY2ggdGltZSwgb3RoZXJ3aXNlIHRoZSBjb3B5IGlzIGludmFsaWQuIE1lbGQgbXVzdCBiZSBpbnN0YWxsZWQuIFRoZSBob3RrZXkgYGN0cmwtb2AgY2FuIG9wZW4gdGhlIGxhc3QgZmlsZSBzZWxlY3RlZCBieSB0aGUgbW91c2UuIiwKICAibmFtZSI6ICJDb3B5IDIgQ29tcGFyZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvbXBhcmUiLAogICJ1dWlkIjogImNvbXBhcmVAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0j2q9msah4g0xl7jnjcf8bc8lbn3is76577f7qwflhv3j3y7q1j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkgdHdvIERpcnMvRmlsZXMgbmFtZXMgZnJvbSBhbnl3aGVyZSBzdWNoIGFzIGBuYXV0aWx1c2Agb3IgYGdub21lLXRlcm1pbmFsYCwgYW5kIHRoZW4gY29tcGFyZSB0aGVtLiAgRGlycy9GaWxlcyBjb3BpZWQgdG8gdGhlIGBDTElQQk9BUkRgIGNhbiBvbmx5IGJlIHVzZWQgZm9yIGNvbXBhcmlzb24uIERpcnMvRmlsZXMgc2VsZWN0ZWQgdG8gdGhlIGBQUklNQVJZYCB3aXRoIG1vdXNlIGNhbiBiZSBvcGVuZWQgYnkgY2xpY2sgdGhlIG1lbnUgaXRlbS4gSXQgbmVlZHMgdG8gYmUgY29waWVkIHR3aWNlLiBPbmx5IG9uZSBmaWxlIG9yIGRpcmVjdG9yeSBjYW4gYmUgY29waWVkIGVhY2ggdGltZSwgb3RoZXJ3aXNlIHRoZSBjb3B5IGlzIGludmFsaWQuIE1lbGQgbXVzdCBiZSBpbnN0YWxsZWQuIFRoZSBob3RrZXkgYGN0cmwtb2AgY2FuIG9wZW4gdGhlIGxhc3QgZmlsZSBzZWxlY3RlZCBieSB0aGUgbW91c2UuIiwKICAibmFtZSI6ICJDb3B5IDIgQ29tcGFyZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvbXBhcmUiLAogICJ1dWlkIjogImNvbXBhcmVAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"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": "2", "sha256": "0isqynyrc7w4wzh5vz5s95mmpk9w9vvgjp7javsv98yi4syqgh3v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAibmFtZSI6ICJGcmVxdWVuY3kgQm9vc3QgU3dpdGNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZyZXEtYm9vc3Qtc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "Alt + Mouse control window, Detailed instructions are on the home page.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "7", "sha256": "0gqm6mrqffdxaad8mh7zd54qb7k4j15xlki4daiq97cw25qr6xni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0gqm6mrqffdxaad8mh7zd54qb7k4j15xlki4daiq97cw25qr6xni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdCArIE1vdXNlIGNvbnRyb2wgd2luZG93LCBEZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXJlIG9uIHRoZSBob21lIHBhZ2UuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "workspace-switcher-manager@G-dH.github.com", "name": "Workspace Switcher Manager", "pname": "workspace-switcher-manager", "description": "Make the workspace switcher popup useful! Customize your workspace switcher behavior and content, dimensions, position, orientation and colors of its popup indicator.\n\n- all GNOME workspace related options at one place\n- adds ws switcher Wraparoud and Ignore Last (empty) Workspace options\n- allows to disable or customize switcher popup\n- allows adding content to the workspace switcher popup - Workspace Name, Current Application Name, Workspace Index\n- ws switcher popup appearance customization includes position on screen, timings, size, colors , orientation", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"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": "11", "sha256": "0dqg87ww1awi7fny6s0zns40nzd91sq506lpm839rszsgvzppsfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0dqg87ww1awi7fny6s0zns40nzd91sq506lpm839rszsgvzppsfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"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": "3", "sha256": "1rizslyrqi1hnkdcajyq63g2azxbixmcf4y78ckh8zyciqrsxk9c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops (If available)\n\nTo check if the function is available, see if the files 'charge_control_start_threshold' and 'charge_control_end_threshold' (valid alternatives: 'charge_start_threshold' and 'charge_stop_threshold') exist in the /sys/class/power_supply/BAT0 directory, also you must have permissions to read and write (in case you do not have write permissions, the root password will be requested to modify the values).", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "3", "sha256": "0689zylxzvm6k2klwmbiwmsd4y6h4idfwa4z61zlssx8j6d40a8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzIChJZiBhdmFpbGFibGUpXG5cblRvIGNoZWNrIGlmIHRoZSBmdW5jdGlvbiBpcyBhdmFpbGFibGUsIHNlZSBpZiB0aGUgZmlsZXMgJ2NoYXJnZV9jb250cm9sX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2VfY29udHJvbF9lbmRfdGhyZXNob2xkJyAodmFsaWQgYWx0ZXJuYXRpdmVzOiAnY2hhcmdlX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2Vfc3RvcF90aHJlc2hvbGQnKSBleGlzdCBpbiB0aGUgL3N5cy9jbGFzcy9wb3dlcl9zdXBwbHkvQkFUMCBkaXJlY3RvcnksIGFsc28geW91IG11c3QgaGF2ZSBwZXJtaXNzaW9ucyB0byByZWFkIGFuZCB3cml0ZSAoaW4gY2FzZSB5b3UgZG8gbm90IGhhdmUgd3JpdGUgcGVybWlzc2lvbnMsIHRoZSByb290IHBhc3N3b3JkIHdpbGwgYmUgcmVxdWVzdGVkIHRvIG1vZGlmeSB0aGUgdmFsdWVzKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJuYW1lIjogIlRoaW5rcGFkIEJhdHRlcnkgVGhyZXNob2xkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"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 permits configuration of the radius, background-color and opacity of the corners.\n\nIt also adds rounded corners to the bottom of the screen and on multiple monitors, thanks to https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328 from Alexander Mikhaylenko!", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": {"40": {"version": "2", "sha256": "1f5s5m11i6mi9jzsx1wxfpc4anp4ricamrcnanklb78zfd8wgbc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgcGVybWl0cyBjb25maWd1cmF0aW9uIG9mIHRoZSByYWRpdXMsIGJhY2tncm91bmQtY29sb3IgYW5kIG9wYWNpdHkgb2YgdGhlIGNvcm5lcnMuXG5cbkl0IGFsc28gYWRkcyByb3VuZGVkIGNvcm5lcnMgdG8gdGhlIGJvdHRvbSBvZiB0aGUgc2NyZWVuIGFuZCBvbiBtdWx0aXBsZSBtb25pdG9ycywgdGhhbmtzIHRvIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjggZnJvbSBBbGV4YW5kZXIgTWlraGF5bGVua28hIiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1f5s5m11i6mi9jzsx1wxfpc4anp4ricamrcnanklb78zfd8wgbc6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgcGVybWl0cyBjb25maWd1cmF0aW9uIG9mIHRoZSByYWRpdXMsIGJhY2tncm91bmQtY29sb3IgYW5kIG9wYWNpdHkgb2YgdGhlIGNvcm5lcnMuXG5cbkl0IGFsc28gYWRkcyByb3VuZGVkIGNvcm5lcnMgdG8gdGhlIGJvdHRvbSBvZiB0aGUgc2NyZWVuIGFuZCBvbiBtdWx0aXBsZSBtb25pdG9ycywgdGhhbmtzIHRvIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjggZnJvbSBBbGV4YW5kZXIgTWlraGF5bGVua28hIiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {"41": {"version": "2", "sha256": "16njsy8sy191zx1abnhxrrfys1nagkf3chj29557fx2ai3aymw7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay4iLAogICJuYW1lIjogIldoYXQgV2F0Y2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuemFwcG9paS53aGF0d2F0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"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"}}} +, {"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": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "cairo@eexpss.gmail.com", "name": "Cairo Clock", "pname": "cairo-clock", "description": "Cairo Clock", "link": "https://extensions.gnome.org/extension/4809/cairo-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "0s9iln4d5vvr4n16k0jd4c2nyj1lxdzjqq45ll0sspq7pagnaw54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrIiwKICAibmFtZSI6ICJDYWlybyBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWlyb0BlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0s9iln4d5vvr4n16k0jd4c2nyj1lxdzjqq45ll0sspq7pagnaw54", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrIiwKICAibmFtZSI6ICJDYWlybyBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjYWlyb0BlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Takes a folder location where wallpapers are stored. Option to change wallpaper randomly or sequentially.", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "048zd332hdybwddlzxczbpdm9x231cqiqgdhmisx6f1n02qjdn0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGEgZm9sZGVyIGxvY2F0aW9uIHdoZXJlIHdhbGxwYXBlcnMgYXJlIHN0b3JlZC4gT3B0aW9uIHRvIGNoYW5nZSB3YWxscGFwZXIgcmFuZG9tbHkgb3Igc2VxdWVudGlhbGx5LiIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlclN3aXRjaGVyIiwKICAidXVpZCI6ICJXYWxscGFwZXJTd2l0Y2hlckBSaXNodSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "048zd332hdybwddlzxczbpdm9x231cqiqgdhmisx6f1n02qjdn0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGEgZm9sZGVyIGxvY2F0aW9uIHdoZXJlIHdhbGxwYXBlcnMgYXJlIHN0b3JlZC4gT3B0aW9uIHRvIGNoYW5nZSB3YWxscGFwZXIgcmFuZG9tbHkgb3Igc2VxdWVudGlhbGx5LiIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlclN3aXRjaGVyIiwKICAidXVpZCI6ICJXYWxscGFwZXJTd2l0Y2hlckBSaXNodSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "048zd332hdybwddlzxczbpdm9x231cqiqgdhmisx6f1n02qjdn0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGEgZm9sZGVyIGxvY2F0aW9uIHdoZXJlIHdhbGxwYXBlcnMgYXJlIHN0b3JlZC4gT3B0aW9uIHRvIGNoYW5nZSB3YWxscGFwZXIgcmFuZG9tbHkgb3Igc2VxdWVudGlhbGx5LiIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlclN3aXRjaGVyIiwKICAidXVpZCI6ICJXYWxscGFwZXJTd2l0Y2hlckBSaXNodSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Takes in the path of the folder containing wallpapers. Changes the wallpaper after given time interval. Option to switch them randomly or sequentially.", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make the color of the battery indicator change with the level of battery charge.", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "inactivity@fedeantuna.github.io", "name": "Inactivity", "pname": "inactivity", "description": "Hide Activities Button on the top panel.", "link": "https://extensions.gnome.org/extension/4818/inactivity/", "shell_version_map": {"41": {"version": "1", "sha256": "1qc16xhgp2wachcxw9ivf8r4nai2k0xj9vph8k0zvc0shwkpjzag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "m3u8-play@eexpss.gmail.com", "name": "M3U8 Play", "pname": "m3u8-play", "description": "M3U8 Play. Search and select to play (use `ffplay/ffmpeg`). `m3u8` files need put into `~/.local/share/m3u8-play/`", "link": "https://extensions.gnome.org/extension/4824/m3u8-play/", "shell_version_map": {"40": {"version": "4", "sha256": "047bijgx902y5v9w6njrbjn380gc8iq49nx0qrzyd8plph947c1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "047bijgx902y5v9w6njrbjn380gc8iq49nx0qrzyd8plph947c1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk0zVTggUGxheS4gU2VhcmNoIGFuZCBzZWxlY3QgdG8gcGxheSAodXNlIGBmZnBsYXkvZmZtcGVnYCkuIGBtM3U4YCBmaWxlcyBuZWVkIHB1dCBpbnRvIGB+Ly5sb2NhbC9zaGFyZS9tM3U4LXBsYXkvYCIsCiAgImdldHRleHQtZG9tYWluIjogIm0zdTgtcGxheSIsCiAgIm5hbWUiOiAiTTNVOCBQbGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtbTN1OC1wbGF5LyIsCiAgInV1aWQiOiAibTN1OC1wbGF5QGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "gnome-edge-gap@necropolina", "name": "Edge Gap", "pname": "edge-gap", "description": "add a gap around the edge of your screen", "link": "https://extensions.gnome.org/extension/4827/edge-gap/", "shell_version_map": {"40": {"version": "2", "sha256": "07gih1gjap9achqd0h4wck25nfpjipdrs72sslpd597imlhlqm2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBhIGdhcCBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "07gih1gjap9achqd0h4wck25nfpjipdrs72sslpd597imlhlqm2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBhIGdhcCBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "overview-keyboard-navigation@G-dH.github.com", "name": "GS 40/41 Overview Keyboard Navigation Fix", "pname": "overview-keyboard-navigation-fix", "description": "Fix for GNOME Shell 40 and 41 that initiates keyboard navigation keys in the Overview by pressing Tab or Arrow keys. It also changes Esc key behavior in the App Grid view - Esc closes the Overview instead of activating Windows Overview.", "link": "https://extensions.gnome.org/extension/4830/overview-keyboard-navigation-fix/", "shell_version_map": {"40": {"version": "1", "sha256": "14b1fpr2xg5r0hnhfwl14f0szg38wkga2dihjcii1chxz877zlr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24ga2V5cyBpbiB0aGUgT3ZlcnZpZXcgYnkgcHJlc3NpbmcgVGFiIG9yIEFycm93IGtleXMuIEl0IGFsc28gY2hhbmdlcyBFc2Mga2V5IGJlaGF2aW9yIGluIHRoZSBBcHAgR3JpZCB2aWV3IC0gRXNjIGNsb3NlcyB0aGUgT3ZlcnZpZXcgaW5zdGVhZCBvZiBhY3RpdmF0aW5nIFdpbmRvd3MgT3ZlcnZpZXcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbi1maXgiLAogICJuYW1lIjogIkdTIDQwLzQxIE92ZXJ2aWV3IEtleWJvYXJkIE5hdmlnYXRpb24gRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1zaGVsbC1leHRlbnNpb24tb3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "14b1fpr2xg5r0hnhfwl14f0szg38wkga2dihjcii1chxz877zlr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24ga2V5cyBpbiB0aGUgT3ZlcnZpZXcgYnkgcHJlc3NpbmcgVGFiIG9yIEFycm93IGtleXMuIEl0IGFsc28gY2hhbmdlcyBFc2Mga2V5IGJlaGF2aW9yIGluIHRoZSBBcHAgR3JpZCB2aWV3IC0gRXNjIGNsb3NlcyB0aGUgT3ZlcnZpZXcgaW5zdGVhZCBvZiBhY3RpdmF0aW5nIFdpbmRvd3MgT3ZlcnZpZXcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbi1maXgiLAogICJuYW1lIjogIkdTIDQwLzQxIE92ZXJ2aWV3IEtleWJvYXJkIE5hdmlnYXRpb24gRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9nbm9tZS1zaGVsbC1leHRlbnNpb24tb3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXcta2V5Ym9hcmQtbmF2aWdhdGlvbkBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "all-windows-srwp@jkavery.github.io", "name": "All Windows + Save/Restore Window Positions", "pname": "all-windows-saverestore-window-positions", "description": "List open windows of all workspaces, plus Save/Restore window positions (run automatically on Suspend/Resume, a workaround for Ubuntu bug #1778983).", "link": "https://extensions.gnome.org/extension/4833/all-windows-saverestore-window-positions/", "shell_version_map": {"40": {"version": "1", "sha256": "1ppgrvmf7lxzqig02p80bh3laxx8bhq6harza82qm8djj62g6kkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzLCBwbHVzIFNhdmUvUmVzdG9yZSB3aW5kb3cgcG9zaXRpb25zIChydW4gYXV0b21hdGljYWxseSBvbiBTdXNwZW5kL1Jlc3VtZSwgYSB3b3JrYXJvdW5kIGZvciBVYnVudHUgYnVnICMxNzc4OTgzKS4iLAogICJuYW1lIjogIkFsbCBXaW5kb3dzICsgU2F2ZS9SZXN0b3JlIFdpbmRvdyBQb3NpdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamthdmVyeS9hbGwtd2luZG93cyIsCiAgInV1aWQiOiAiYWxsLXdpbmRvd3Mtc3J3cEBqa2F2ZXJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix index bba3000b7f..90bd99e4a7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -9,6 +9,7 @@ , itstool , clutter-gtk , libgee +, libgnome-games-support , gnome , gtk3 }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ clutter-gtk libgee - gnome.libgnome-games-support + libgnome-games-support gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix index 6a7168badb..d60a58a83c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; + sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; }; # gobject-introspection for finding vapi files diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index bdaeb47ab2..f593fbbd65 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.5"; + version = "3.42.6"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-BpDA2V40V+VF2CB7ik+edMxrRtYSFnTQ48ec6pt8Jo4="; + sha256 = "sha256-dCeNWdHj3bBGJR1VpJtQjSn601Vdl3f9FjHAPB2wuhE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/update.nix b/third_party/nixpkgs/pkgs/desktops/gnome/update.nix index 928eac4516..f5db71174a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/update.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/update.nix @@ -1,26 +1,42 @@ -{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: +{ stdenv, bash, pkgs, lib, writeScript, python3, common-updater-scripts }: { packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let python = python3.withPackages (p: [ p.requests p.libversion ]); - upperBoundFlag = + package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; + packageVersion = lib.getVersion package; + upperBound = let - package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; - packageVersion = lib.getVersion package; versionComponents = lib.versions.splitVersion packageVersion; minorVersion = lib.versions.minor packageVersion; minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; nextMinor = builtins.fromJSON minorVersion + 1; upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; - in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; + in lib.optionals (freeze && minorAvailable) [ upperBound ]; updateScript = writeScript "gnome-update-script" '' - #!${stdenv.shell} + #!${bash}/bin/bash set -o errexit - package_name="$1" - attr_path="$2" - version_policy="$3" + attr_path="$1" + package_name="$2" + package_version="$3" + version_policy="$4" + + flvFlags=("$package_name" "$version_policy" "''${GNOME_UPDATE_STABILITY:-stable}") + + if (( $# >= 5 )); then + upper_bound="$5" + flvFlags+=("--upper-bound=$upper_bound") + fi + PATH=${lib.makeBinPath [ common-updater-scripts python ]} - latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) + latest_tag=$(python "${./find-latest-version.py}" "''${flvFlags[@]}") update-source-version "$attr_path" "$latest_tag" + echo '[ { "commitBody": "https://gitlab.gnome.org/GNOME/'$package_name'/-/compare/'$package_version'...'$latest_tag'" } ]' ''; -in [ updateScript packageName attrPath versionPolicy ] +in { + name = "gnome-update-script"; + command = [ updateScript attrPath packageName packageVersion versionPolicy ] ++ upperBound; + supportedFeatures = [ + "commit" + ]; +} diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix index 062ca4abfe..5404c0c775 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix @@ -4,10 +4,9 @@ let # Update script tailored to LXQt packages from git repository lxqtUpdateScript = { pname, version, src }: - pkgs.genericUpdater { + pkgs.gitUpdater { inherit pname version; attrPath = "lxqt.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; # For compiling information, see: diff --git a/third_party/nixpkgs/pkgs/desktops/mate/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/default.nix index e9822f0242..2c5b45a653 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/default.nix @@ -7,10 +7,9 @@ let # Update script tailored to mate packages from git repository mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.genericUpdater { - inherit pname version odd-unstable; + pkgs.httpTwoLevelsUpdater { + inherit pname version odd-unstable url; attrPath = "mate.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}"; }; atril = callPackage ./atril { }; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix index ebac46692c..e0fc06135e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix @@ -9,8 +9,7 @@ , gobject-introspection , wrapGAppsHook , glib -, genericUpdater -, common-updater-scripts +, gitUpdater }: python3Packages.buildPythonApplication rec { @@ -74,10 +73,9 @@ python3Packages.buildPythonApplication rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "mate.${pname}"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index d62141ece2..93c10d0729 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -7,6 +7,7 @@ , desktop-file-utils , elementary-icon-theme , fetchFromGitHub +, fetchpatch , flatpak , gettext , glib @@ -38,6 +39,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; + patches = [ + # Fix AppStream.PoolFlags being renamed + # Though the API break has been fixed in latest appstream, + # let's use the non-deprecated version anyway. + # https://github.com/elementary/appcenter/pull/1794 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/84bc6400713484aa9365f0ba73f59c495da3f08b.patch"; + sha256 = "sha256-HNRCJ/5mRbEVjCq9nrXtdQOOk1Jj5jalApkghD8ecpk="; + }) + ]; + nativeBuildInputs = [ appstream-glib dbus # for pkg-config diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index fe7a8e946d..45a8f119ee 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -31,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; + sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg="; }; patches = [ @@ -47,15 +46,6 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) - # https://github.com/NixOS/nixpkgs/issues/151609 - # https://github.com/elementary/greeter/issues/578#issuecomment-1030746697 - ./fix-crash.patch - # Fix build with meson 0.61 - # https://github.com/elementary/greeter/pull/590 - (fetchpatch { - url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; - sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; - }) ]; nativeBuildInputs = [ @@ -80,7 +70,6 @@ stdenv.mkDerivation rec { libhandy lightdm mutter - wingpanel-with-indicators ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch deleted file mode 100644 index ca6f6aab6d..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala -index 83df22c..8cd917e 100644 ---- a/src/Cards/UserCard.vala -+++ b/src/Cards/UserCard.vala -@@ -42,6 +42,7 @@ public class Greeter.UserCard : Greeter.BaseCard { - private Gtk.Stack login_stack; - private Greeter.PasswordEntry password_entry; - -+ private SelectionCheck logged_in; - private unowned Gtk.StyleContext logged_in_context; - private weak Gtk.StyleContext main_grid_style_context; - private weak Gtk.StyleContext password_entry_context; -@@ -214,7 +215,7 @@ public class Greeter.UserCard : Greeter.BaseCard { - }; - avatar_overlay.add (avatar); - -- var logged_in = new SelectionCheck () { -+ logged_in = new SelectionCheck () { - halign = Gtk.Align.END, - valign = Gtk.Align.END - }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix new file mode 100644 index 0000000000..caf3819a36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitLab, python3 }: +let + pythonEnv = python3.withPackages (p: with p; [ dbus-python pygobject3 ]); +in +stdenv.mkDerivation rec { + pname = "krunner-ssh"; + version = "1.0"; + + src = fetchFromGitLab { + owner = "Programie"; + repo = "krunner-ssh"; + rev = version; + sha256 = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; + }; + + postPatch = '' + sed -e "s|Exec=.*|Exec=$out/libexec/runner.py|" -i ssh-runner.service + ''; + + nativeBuildInputs = [ + pythonEnv + ]; + + installPhase = '' + runHook preInstall + + patchShebangs runner.py + + install -m 0755 -D runner.py $out/libexec/runner.py + install -m 0755 -D ssh-runner.desktop $out/share/kservices5/ssh-runner.desktop + install -m 0755 -D ssh-runner.service $out/share/dbus-1/services/com.selfcoders.ssh-runner.service + + runHook postInstall + ''; + + meta = with lib; { + description = "A simple backend for KRunner providing SSH hosts from your .ssh/known_hosts file as search results"; + homepage = "https://selfcoders.com/projects/krunner-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ aanderse ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 95480bc5b9..23802bef97 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "krohnkite"; - version = "0.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "esjeon"; repo = "krohnkite"; rev = "v${version}"; - sha256 = "0j3rm1w6d545qlmx02xs72b5zsigm48hp7lp7yh30z3cjqm00aap"; + hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix index 0eafc182e4..072d999b1a 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -161,6 +161,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { }; krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; lightly = callPackage ./3rdparty/lightly { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix index f38dacf0db..4e5028a6a5 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix @@ -38,10 +38,9 @@ stdenv.mkDerivation rec { }) ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = xfce.archiveUpdater { + category = "apps"; inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister "apps" pname; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 8c4dff8074..8c37dde65c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -28,11 +28,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 2c84c619c6..3665263ede 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -13,11 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU="; }; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix index 2340a57c22..1ec4cec5b3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix @@ -3,13 +3,14 @@ lib.makeScope pkgs.newScope (self: with self; { #### NixOS support - updateScript = pkgs.genericUpdater; + genericUpdater = pkgs.genericUpdater; - gitLister = url: - "${pkgs.common-updater-scripts}/bin/list-git-tags ${url}"; - - archiveLister = category: name: - "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}"; + archiveUpdater = { category, pname, version }: + pkgs.httpTwoLevelsUpdater { + inherit pname version; + attrPath = "xfce.${pname}"; + url = "https://archive.xfce.org/src/${category}/${pname}"; + }; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix index 8ff0d83cae..261178381e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook, gitUpdater }: { category , pname @@ -41,9 +41,8 @@ let pos = builtins.unsafeGetAttrPos "pname" args; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index dd74a0653b..33bdb052b6 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -45,11 +45,7 @@ in stdenv.mkDerivation rec { hicolor-icon-theme ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index 76868bcd55..cc4ce861e7 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -33,11 +33,7 @@ in stdenv.mkDerivation rec { gtk2 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 3ee9078813..08434ad252 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -35,11 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 084cb764c6..81498aea96 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -35,11 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 9700d515fb..1b794ff2b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -33,11 +33,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index 455370ca38..fdd3af5fe4 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -27,11 +27,7 @@ stdenv.mkDerivation rec { libgcrypt ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 1f935ac4a4..5664758693 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -27,11 +27,7 @@ stdenv.mkDerivation rec { exo ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index ec64a60fb5..e7f20a0ec7 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: +, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce +, gitUpdater +}: stdenv.mkDerivation rec { pname = "xfce4-namebar-plugin"; @@ -20,10 +22,9 @@ stdenv.mkDerivation rec { substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" ''; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index c2a7aa694d..6cb2fcc66c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -31,11 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index c45fba5ebd..22b4d8c4f4 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -38,11 +38,7 @@ stdenv.mkDerivation rec { "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 7236eb97d6..d264181bd4 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -31,11 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 35840b9d24..c3cb16dfa8 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -28,11 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 4ce0fae5a3..5ceda9cb8b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -31,11 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 6a2386e0f8..5e5e6c8aa6 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 75ef2491fe..e056c90a55 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -6,6 +6,7 @@ , cmake , ninja , xfce +, gitUpdater }: stdenv.mkDerivation rec { @@ -30,10 +31,9 @@ stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.thunar-dropbox-plugin"; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix index e077040c69..810486e2bc 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -24,7 +24,7 @@ in rebar3Relx rec { set -euo pipefail - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang" 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 08ebb6136f..be9c647437 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 @@ -51,7 +51,7 @@ rebar3Relx { #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }" set -ox errexit - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [[ "$latest" != "${version}" ]]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls" diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad7..a44eaeb369 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (mkDerivationArgs // { '') crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " (args.options or defaultOptions)}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index 33a386cfb9..6e6b27c2cf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -79,5 +79,12 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; + cudatoolkit_11_6 = common { + version = "11.6.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"; + sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_4; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 149d811505..ab19ac42d2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskellPackages.override { + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; { inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) - diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index 6f6130c367..9eba677344 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,20 +4,20 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.10.0"; + version = "2.10.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.0"; + dartVersion = "2.16.1"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM="; + sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; }; }; }; @@ -29,7 +29,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U="; + sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y="; }; patches = getPatches ./patches; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index 25abd79490..fc0f50d079 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -11,20 +11,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; }; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + strictDeps = true; - buildInputs = [ - z3 + nativeBuildInputs = [ + makeWrapper + installShellFiles ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild + menhir + ]); + + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ batteries zarith stdint yojson fileutils - menhir menhirLib pprint sedlex_2 diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix index 46591d2369..c30abc44fe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.14"; + version = "1.16.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y="; + sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix index d527789989..4ac022be6a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,7 @@ let ocamlDependencies = version: if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages; [ + then with ocaml-ng.ocamlPackages_4_12; [ ocaml findlib sedlex_2 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix new file mode 100644 index 0000000000..53f7941e33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' 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 new file mode 100644 index 0000000000..9544494b35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix @@ -0,0 +1,131 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation (rec { + pname = "clang"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) + ]; + + 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 + + # 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 + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + postInstall = '' + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin + ''; + + passthru = { + isClang = true; + inherit libllvm; + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..57c54e18c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch @@ -0,0 +1,50 @@ +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 9bbbfc032b7d..947bd0da865d 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +@@ -175,7 +175,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 078988980c52..14b58614b40a 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 4e0647971ab4..68dd67fcc476 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch new file mode 100644 index 0000000000..deb230a36c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch new file mode 100644 index 0000000000..66742e5b14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -345,4 +345,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${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)$") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch new file mode 100644 index 0000000000..120cfe6feb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +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/14/compiler-rt/codesign.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch new file mode 100644 index 0000000000..065959d14d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch @@ -0,0 +1,33 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc69ec95c419..9f100fdcec2f 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $ +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} +- ) +- endif() + endif() + + set(parent_target_arg) +2.14.1 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 0000000000..425dc2af01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix new file mode 100644 index 0000000000..59ca5348fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -0,0 +1,126 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl; + + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; +in + +stdenv.mkDerivation { + pname = baseName + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake python3 libllvm.dev ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary + ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + ] # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include " "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include " "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include " "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..55837bd8e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a41aa43e406..f000cee6eae0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index d7b0124f3546..3e111146df4d 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -67,7 +67,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -99,13 +99,13 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000..135cf625ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix new file mode 100644 index 0000000000..6f4a0d8ee7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -0,0 +1,278 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +}: + +let + release_version = "14.0.0"; + candidate = "rc1"; # empty or "rcN" + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; + rev = ""; # When using a Git commit + rev-version = ""; # When using a Git commit + version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; + targetConfig = stdenv.targetPlatform.config; + + monorepoSrc = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + rev = if rev != "" then rev else "llvmorg-${version}"; + sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E="; + }; + + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputSpecified = false; }; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ./lldb { + inherit llvm_meta; + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools {}; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands0 cc; + }; + + clangNoCompilerRtWithLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + }; + + libcxxabi = let + stdenv_ = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + stdenv = stdenv_; + headersOnly = true; + }; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta; + }; + }); + +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix new file mode 100644 index 0000000000..8891a69937 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version +, libcxxabi +, enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false +}: + +let + basename = "libcxx"; +in + +stdenv.mkDerivation rec { + pname = basename + lib.optionalString headersOnly "-headers"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + + cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + buildFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + # At this point, cxxabi headers would be installed in the dev output, which + # prevents moveToOutput from doing its job later in the build process. + postInstall = lib.optionalString (!headersOnly) '' + mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" + pushd "$dev" + rmdir -p include/c++/v1 + popd + ''; + + passthru = { + isLLVM = true; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch new file mode 100644 index 0000000000..0f1d5c411a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b0569a4a54ca..7d665f5a3258 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 5a8a4a270a1a..d69405ddeeac 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}" + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix new file mode 100644 index 0000000000..07aaa2737c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./wasm.patch} + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 0000000000..a93348ded0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 858f5d5cfd7f..16c67d7062be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch new file mode 100644 index 0000000000..4ebfe46aa8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix new file mode 100644 index 0000000000..109b92f1e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..3f05d2a872 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3cc66dd2226..1299b596ce0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") + else() +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + endif() + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) 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 new file mode 100644 index 0000000000..fe655c7611 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch new file mode 100644 index 0000000000..38fb965b47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..89a5822df4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index dd2898ce6236..ebbea040ff54 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) +@@ -62,5 +62,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix new file mode 100644 index 0000000000..fdfb550c28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -0,0 +1,145 @@ +{ lib, stdenv, llvm_meta +, runCommand +, monorepoSrc +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, makeWrapper +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit makeWrapper + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + libllvm + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ]; + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${libclang.dev}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = false; + + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; + description = "A next-generation high-performance debugger"; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; + broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E' + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..f69ed9e162 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79d451965ed4..78188978d6de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..b27d27ce6a87 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -109,7 +109,7 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch new file mode 100644 index 0000000000..b075dbaeee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include ++#undef pt_regs ++#else + #include +-#endif // __ANDROID__ ++#endif diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch new file mode 100644 index 0000000000..e0db80afeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix new file mode 100644 index 0000000000..d2059cc66b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -0,0 +1,254 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, buildLlvmTools +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +} @args: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + checkInputs = [ which ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; let + # These flags influence llvm-config's BuildVariables.inc in addition to the + # general build. We need to make sure these are also passed via + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform); + + checkTarget = "check-all"; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..98e998e65a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,102 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index ca7c04c565bb..6a6155806ffa 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.13.4) + ++ include(GNUInstallDirs) ++ + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -122,13 +124,13 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 7cc129ba2e90..137be25e4b80 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index e3a5683fccdc..293b482eb28a 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..55862ab393 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch @@ -0,0 +1,220 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fec956091cd5..5a766f5c5d7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index fed1fec7d72e..4baed19b9e98 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -838,8 +838,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1902,7 +1902,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) + + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2148,9 +2149,9 @@ function(llvm_setup_rpath name) + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index cea0c1df0a14..eedcd9450312 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -2,7 +2,7 @@ include(ExtendPath) + include(LLVMDistributionSupport) + include(FindPrefixFromConfig) + +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index b5c35f706cb7..9261ab797de6 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -6,7 +6,7 @@ include(GNUInstallDirs) + + function(install_symlink name target outdir) + set(DESTDIR $ENV{DESTDIR}) +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 044ec8a4d39d..504d0eac3ade 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index abbb8a450da6..70c497be12f5 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,7 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 8ed88f33ead4..5e7184bab90d 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } ++ { ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix new file mode 100644 index 0000000000..2b580a9c16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, llvm +, clang-unwrapped +, perl +, pkg-config +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./fix-find-tool.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; + buildInputs = [ llvm ]; + + cmakeFlags = [ + "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch new file mode 100644 index 0000000000..b5d0e7b417 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch @@ -0,0 +1,54 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 242df638f80d..a4654e96371f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -25,16 +25,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang from in-tree build") + else() + libomptarget_say("Not building DeviceRTL. No appropriate clang found") +diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +index 3f4c02671aeb..be9f4677d7b5 100644 +--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt ++++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +@@ -38,16 +38,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") + else() + libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch new file mode 100644 index 0000000000..352a469231 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f11a05f5622..fb90f8f6a49b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_STANDALONE_BUILD TRUE) + project(openmp C CXX) + ++ include(GNUInstallDirs) ++ + # CMAKE_BUILD_TYPE was not set, default to Release. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +index 0e1ce2afd154..8b3810f83713 100644 +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +index 16ce0891ca23..db30ee9c769f 100644 +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" +diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt +index e4f4e6e1e73f..1164b3b22b0e 100644 +--- a/runtime/src/CMakeLists.txt ++++ b/runtime/src/CMakeLists.txt +@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib + # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include + if(${OPENMP_STANDALONE_BUILD}) +- set(LIBOMP_HEADERS_INSTALL_PATH include) ++ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + else() + string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") + endif() + if(WIN32) +- install(TARGETS omp RUNTIME DESTINATION bin) ++ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") + # Create aliases (regular copies) of the library for backwards compatibility + set(LIBOMP_ALIASES "libiomp5md") +diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt +index 64317c112176..4002784da736 100644 +--- a/tools/multiplex/CMakeLists.txt ++++ b/tools/multiplex/CMakeLists.txt +@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) + add_library(ompt-multiplex INTERFACE) + target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +- install(FILES ompt-multiplex.h DESTINATION include) ++ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + add_subdirectory(tests) + endif() 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 3873bda2b6..9544494b35 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,16 +1,23 @@ -{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3 +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: let - self = stdenv.mkDerivation ({ + self = stdenv.mkDerivation (rec { pname = "clang"; inherit version; - inherit src; - sourceRoot = "source/clang"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index b834d386b4..a8825f0885 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e74014134a0..976e6a1757fd 100644 +index 7ea37850ad60..ac0f2d4f60b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) project(Clang) + include(GNUInstallDirs) @@ -11,7 +11,7 @@ index 9e74014134a0..976e6a1757fd 100644 set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) -@@ -416,7 +418,7 @@ include_directories(BEFORE +@@ -424,7 +426,7 @@ include_directories(BEFORE if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/clang include/clang-c @@ -20,7 +20,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "*.def" -@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -433,7 +435,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang @@ -29,7 +29,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE -@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -453,7 +455,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) install(PROGRAMS utils/bash-autocomplete.sh @@ -39,10 +39,10 @@ index 9e74014134a0..976e6a1757fd 100644 if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-bash-autocomplete diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 704278a0e93b..d25c8d325c71 100644 +index 5752f4277444..5bf08dbf5e83 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake -@@ -123,9 +123,9 @@ macro(add_clang_library name) +@@ -118,9 +118,9 @@ macro(add_clang_library name) install(TARGETS ${lib} COMPONENT ${lib} ${export_to_clangtargets} @@ -55,8 +55,8 @@ index 704278a0e93b..d25c8d325c71 100644 if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${lib} -@@ -170,7 +170,7 @@ macro(add_clang_tool name) - +@@ -159,7 +159,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION bin @@ -64,7 +64,7 @@ index 704278a0e93b..d25c8d325c71 100644 COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) -@@ -185,7 +185,7 @@ endmacro() +@@ -174,7 +174,7 @@ endmacro() macro(add_clang_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets @@ -74,10 +74,10 @@ index 704278a0e93b..d25c8d325c71 100644 function(clang_target_link_libraries target type) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index b2c0ce8dd4a0..19e5443d8c25 100644 +index 078988980c52..14b58614b40a 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt -@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -87,10 +87,10 @@ index b2c0ce8dd4a0..19e5443d8c25 100644 install( FILES ${files} ${generated_files} diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..8efad5520ca4 100644 +index 99c6081db2d6..0887102febb3 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH "@executable_path/../../lib") else() @@ -146,10 +146,10 @@ index cda8e29ec5b1..0134d8ccd70b 100644 + DESTINATION ${CMAKE_INSTALL_DATADIR}/clang COMPONENT clang-rename) diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 51ff2e7e1565..1ed5f8a079a1 100644 +index bf88dca0a34b..7a10181e7738 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt -@@ -166,7 +166,7 @@ endif() +@@ -186,7 +186,7 @@ endif() if(INTERNAL_INSTALL_PREFIX) set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") else() @@ -158,7 +158,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 endif() install(DIRECTORY ../../include/clang-c -@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION @@ -168,7 +168,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index ec0702d76f18..d25d982f51da 100644 +index 74334e53c9b1..ebaae33e4324 100644 --- a/tools/scan-build/CMakeLists.txt +++ b/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -199,10 +199,10 @@ index ec0702d76f18..d25d982f51da 100644 endforeach() diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index dd3d33439299..fea19c12ce70 100644 +index eccc6b83195b..ff72d9cf0666 100644 --- a/tools/scan-view/CMakeLists.txt +++ b/tools/scan-view/CMakeLists.txt -@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} @@ -211,7 +211,7 @@ index dd3d33439299..fea19c12ce70 100644 COMPONENT scan-view) endforeach() -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -34,7 +34,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) install(FILES share/${ShareFile} 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 019148039d..59ca5348fe 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,4 +1,7 @@ -{ lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }: +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: let @@ -7,14 +10,21 @@ let haveLibc = stdenv.cc.libc != null; inherit (stdenv.hostPlatform) isMusl; + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; in stdenv.mkDerivation { - pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; + pname = baseName + lib.optionalString (haveLibc) "-libc"; inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/${baseName}"; nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -58,6 +68,7 @@ stdenv.mkDerivation { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..909b5193ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5003b5efa1d..4fffb9721284 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 1ada0ab30ba0..b4be6c4a3c73 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -66,7 +66,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -98,23 +98,23 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" bin) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}") + set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt executables should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" include) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}") + set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt headers should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" share) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}") + set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt data files should be installed.") + 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 890270c851..0f45acffb2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -21,16 +21,16 @@ let release_version = "14.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "ee65938357d5fffe9e586fa155b37268b5a358ac"; # When using a Git commit - rev-version = "unstable-2021-08-13"; # When using a Git commit + rev = "fb1582f6c54422995c6fb61ba4c55126b357f64e"; # When using a Git commit + rev-version = "unstable-2022-01-07"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; - src = fetchFromGitHub { + monorepoSrc = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "10ahc108wbg2rsp50j3mc8h018a453ykg1rivjkhizng80pyllm1"; + sha256 = "1pkgdsscvf59i22ix763lp2z3sg0v2z2ywh0n07k3ki7q1qpqbhk"; }; llvm_meta = { @@ -40,7 +40,7 @@ let }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -218,7 +218,7 @@ let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake 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 0ddf28909b..8891a69937 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,4 +1,6 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version , libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic @@ -10,12 +12,26 @@ , headersOnly ? false }: +let + basename = "libcxx"; +in + stdenv.mkDerivation rec { - pname = if headersOnly then "cxx-headers" else "libcxx"; + pname = basename + lib.optionalString headersOnly "-headers"; inherit version; - inherit src; - sourceRoot = "source/libcxx"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index 744967a6ee..0f1d5c411a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,82 +1,85 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1e25358d41a..7fe1f4d85401 100644 +index b0569a4a54ca..7d665f5a3258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) - project(libcxx CXX C) +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) -+ include(GNUInstallDirs) ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -412,7 +414,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -426,7 +428,7 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -436,7 +438,7 @@ else() + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5a8a4a270a1a..c06bae0001aa 100644 +index 5a8a4a270a1a..d69405ddeeac 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" - DESTINATION include/c++/v1/${dstdir} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}" COMPONENT cxx-headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 496429f3841e..1a0c9c0a3159 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -376,21 +376,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) - install(TARGETS cxx_shared - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - if (LIBCXX_INSTALL_STATIC_LIBRARY) - install(TARGETS cxx_static - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) - install(TARGETS cxx_experimental - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - # NOTE: This install command must go after the cxx install command otherwise 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 9f14f87a7a..d64708ab04 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,6 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,19 @@ stdenv.mkDerivation rec { pname = "libcxxabi"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index 5d562dd59a..a93348ded0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,37 +1,46 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fb35860d483..5739d9e8af62 100644 +index 858f5d5cfd7f..16c67d7062be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) - project(libcxxabi CXX C) +@@ -10,6 +10,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") else() set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") endif() 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 b6017e7417..c6d9eda5e4 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,4 +1,6 @@ -{ lib, stdenv, llvm_meta, version, src, cmake +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,20 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch index 8cd25c56f8..3f05d2a872 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch @@ -1,36 +1,65 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 81eddbc24879..e2afb2002150 100644 +index e3cc66dd2226..1299b596ce0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) - project(libunwind LANGUAGES C CXX ASM) +@@ -8,6 +8,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") + set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) -@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) endif() - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH - "Path where built libunwind libraries should be installed.") +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") else() - set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") endif() +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) 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 34ac265f4b..fe655c7611 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 @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , buildLlvmTools -, src +, monorepoSrc, runCommand , cmake , libxml2 , libllvm @@ -11,19 +11,30 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libllvm libxml2 ]; - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch new file mode 100644 index 0000000000..26ecef2564 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt +index e1a29b884d17..9d542f8fbfc1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + + set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch index 61e2f0e486..89a5822df4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch @@ -1,68 +1,22 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e561b50d8f..cfa5bdd79c2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -179,7 +181,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - ) diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index 23df41312403..d62372c88de7 100644 +index dd2898ce6236..ebbea040ff54 100644 --- a/cmake/modules/AddLLD.cmake +++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) +@@ -18,8 +18,8 @@ macro(add_lld_library name) install(TARGETS ${name} COMPONENT ${name} ${export_to_lldtargets} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() +@@ -62,5 +62,5 @@ endmacro() macro(add_lld_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets - llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) + llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 5cff736ff57f..64e775c771b9 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE 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 96d8b19ee4..a2c68b2247 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 @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , runCommand -, src +, monorepoSrc , cmake , zlib , ncurses @@ -27,8 +27,13 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./procfs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch index afc945ce26..f69ed9e162 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5633e21c56a..f2f1035e9238 100644 +index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) @@ -12,10 +12,10 @@ index b5633e21c56a..f2f1035e9238 100644 include(LLDBStandalone) diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4ed5c647c5d2..89f96e710d55 100644 +index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake +++ b/cmake/modules/AddLLDB.cmake -@@ -107,13 +107,13 @@ function(add_lldb_library name) +@@ -109,7 +109,7 @@ function(add_lldb_library name) endif() if(PARAM_SHARED) @@ -24,68 +24,13 @@ index 4ed5c647c5d2..89f96e710d55 100644 if(PARAM_INSTALL_PREFIX) set(install_dest ${PARAM_INSTALL_PREFIX}) endif() - # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS - install(TARGETS ${name} COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${install_dest} - ARCHIVE DESTINATION ${install_dest} - FRAMEWORK DESTINATION ${install_dest}) -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 2fdf1502d055..37364341ff8b 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -225,7 +225,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE -@@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index 734167e51bc5..f95761b5df58 100644 +index 7d48491ec89a..c04543585588 100644 --- a/tools/intel-features/CMakeLists.txt +++ b/tools/intel-features/CMakeLists.txt -@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) - endif() +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) -diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake -index 752113b..010f187 100644 ---- a/cmake/modules/LLDBStandalone.cmake -+++ b/cmake/modules/LLDBStandalone.cmake -@@ -62,7 +62,7 @@ endif() - - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) --set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 OR CYGWIN) - # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5633e2..86e4738 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) - if(LLDB_BUILD_FRAMEWORK) - set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") - else() -- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") -+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") - endif() - get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) - finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") 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 fc7030810c..d2059cc66b 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 @@ -1,6 +1,7 @@ { lib, stdenv, llvm_meta , pkgsBuildBuild -, src +, monorepoSrc +, runCommand , fetchpatch , cmake , python3 @@ -22,7 +23,7 @@ || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false -}: +} @args: let inherit (lib) optional optionals optionalString; @@ -35,8 +36,16 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -51,12 +60,6 @@ in stdenv.mkDerivation (rec { checkInputs = [ which ]; patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - ./gnu-install-dirs.patch ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch index 68f3c45396..98e998e65a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch @@ -1,20 +1,17 @@ diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index ca7c04c565bb..6ed5db5dd4f8 100644 +index ca7c04c565bb..6a6155806ffa 100644 --- a/tools/polly/CMakeLists.txt +++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) project(Polly) cmake_minimum_required(VERSION 3.13.4) -+endif() -+ -+include(GNUInstallDirs) -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) ++ include(GNUInstallDirs) ++ # Where is LLVM installed? find_package(LLVM CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -122,13 +126,13 @@ include_directories( +@@ -122,13 +124,13 @@ include_directories( if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/ @@ -91,10 +88,10 @@ index 518a09b45a42..bd9d6f5542ad 100644 set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) endmacro(add_polly_library) diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8991094d92c7..178d8ad606bb 100644 +index e3a5683fccdc..293b482eb28a 100644 --- a/tools/polly/lib/External/CMakeLists.txt +++ b/tools/polly/lib/External/CMakeLists.txt -@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) install(DIRECTORY ${ISL_SOURCE_DIR}/include/ ${ISL_BINARY_DIR}/include/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch index 18fa5fc6d8..55862ab393 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch @@ -1,23 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 135036f509d2..265c36f8211b 100644 +index fec956091cd5..5a766f5c5d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_UTILS_INSTALL_DIR) +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) +set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING + "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) @@ -25,70 +12,22 @@ index 135036f509d2..265c36f8211b 100644 # They are used as destination of target generators. set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -581,9 +587,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - option (LLVM_ENABLE_BINDINGS "Build bindings." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -1048,7 +1054,7 @@ endif() - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - if (LLVM_INSTALL_MODULEMAPS) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "module.modulemap" - ) - install(FILES include/llvm/module.install.modulemap -- DESTINATION include/llvm -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm - COMPONENT llvm-headers - RENAME "module.extern.modulemap" - ) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 9c2b85374307..5531ceeb2eeb 100644 +index fed1fec7d72e..4baed19b9e98 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -818,9 +818,9 @@ macro(add_llvm_library name) +@@ -838,8 +838,8 @@ macro(add_llvm_library name) get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -- RUNTIME DESTINATION bin COMPONENT ${name}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) - add_llvm_install_targets(install-${name} -@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") install(FILES ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake @@ -97,16 +36,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT cmake-exports) set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -@@ -1250,7 +1250,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1902,7 +1902,7 @@ function(llvm_install_library_symlink name dest type) set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) @@ -115,7 +45,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir bin) endif() -@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) endfunction() @@ -124,7 +54,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) foreach(path ${CMAKE_MODULE_PATH}) if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) install(SCRIPT ${INSTALL_SYMLINK} @@ -133,7 +63,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT ${component}) if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) -@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target) +@@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target) endif() if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) @@ -143,7 +73,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 endif() endif() endfunction() -@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name) +@@ -2148,9 +2149,9 @@ function(llvm_setup_rpath name) # Since BUILD_SHARED_LIBS is only recommended for use by developers, # hardcode the rpath to build/install lib dir first in this mode. # FIXME: update this when there is better solution. @@ -156,10 +86,10 @@ index 9c2b85374307..5531ceeb2eeb 100644 set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,origin ") diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 554046b20edf..4d1ad980641e 100644 +index 891c9e6d618c..8d963f3b0069 100644 --- a/cmake/modules/AddOCaml.cmake +++ b/cmake/modules/AddOCaml.cmake -@@ -144,9 +144,9 @@ function(add_ocaml_library name) +@@ -147,9 +147,9 @@ function(add_ocaml_library name) endforeach() if( APPLE ) @@ -171,86 +101,55 @@ index 554046b20edf..4d1ad980641e 100644 endif() list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index e80c3b5c1cac..482f6d715ef5 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -90,7 +90,7 @@ function (add_sphinx_target builder project) - endif() - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 51b6a4fdc284..4adc2acfc074 100644 +index cea0c1df0a14..eedcd9450312 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -2,7 +2,7 @@ include(ExtendPath) include(LLVMDistributionSupport) + include(FindPrefixFromConfig) -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) +set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -109,13 +109,13 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") - set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") - set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) - # Generate a default location for lit - if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 3e6a2c9a2648..52e14d955c60 100644 +index b5c35f706cb7..9261ab797de6 100644 --- a/cmake/modules/LLVMInstallSymlink.cmake +++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ include(GNUInstallDirs) function(install_symlink name target outdir) set(DESTDIR $ENV{DESTDIR}) -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") + set(bindir "${DESTDIR}${outdir}/") message(STATUS "Creating ${name}") diff --git a/docs/CMake.rst b/docs/CMake.rst -index f1ac2c7d4934..c6e1469b5e13 100644 +index 044ec8a4d39d..504d0eac3ade 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst -@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. **LLVM_LIBDIR_SUFFIX**:STRING Extra suffix to append to the directory where libraries are to be installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` - to install libraries to ``/usr/lib64``. + to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - Rarely-used CMake variables - --------------------------- -@@ -551,8 +551,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_LINK_LLVM_DYLIB**:BOOL - If enabled, tools will be linked with the libLLVM shared library. Defaults -@@ -792,9 +792,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). This file is available in two different locations. @@ -265,18 +164,6 @@ index f1ac2c7d4934..c6e1469b5e13 100644 * ``/lib/cmake/llvm/LLVMConfig.cmake`` where ```` is the root of the LLVM build tree. **Note: this is only -diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt -index bb96edb4b4bf..678c22fb43c8 100644 ---- a/examples/Bye/CMakeLists.txt -+++ b/examples/Bye/CMakeLists.txt -@@ -14,6 +14,6 @@ if (NOT WIN32) - BUILDTREE_ONLY - ) - -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endif() diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt index b46319f24fc8..2feabd1954e4 100644 --- a/include/llvm/CMakeLists.txt @@ -289,93 +176,45 @@ index b46319f24fc8..2feabd1954e4 100644 + configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index ebe5b73a5c65..70c497be12f5 100644 +index abbb8a450da6..70c497be12f5 100644 --- a/tools/llvm-config/BuildVariables.inc.in +++ b/tools/llvm-config/BuildVariables.inc.in -@@ -23,6 +23,10 @@ +@@ -23,7 +23,10 @@ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" +#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" +#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 1a2f04552d13..44fa7d3eec6b 100644 +index 8ed88f33ead4..5e7184bab90d 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -357,12 +357,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = std::string(path.str()); +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; - ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); + } + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); + } ActiveIncludeOption = "-I" + ActiveIncludeDir; } -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 0af29ad762c5..37b99b83e35c 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN - ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index ead73ec13a8f..250362021f17 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,7 +8,7 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) - -diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt -index 865436247270..ce1daa62f6ab 100644 ---- a/tools/remarks-shlib/CMakeLists.txt -+++ b/tools/remarks-shlib/CMakeLists.txt -@@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC) - endif() - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT Remarks) - - if (APPLE) 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 c5a33df975..7add0c7ed4 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 @@ -1,10 +1,13 @@ { lib , stdenv , llvm_meta -, src +, monorepoSrc +, runCommand , cmake , llvm +, clang-unwrapped , perl +, pkg-config , version }: @@ -12,10 +15,22 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; - nativeBuildInputs = [ cmake perl ]; + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./fix-find-tool.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; buildInputs = [ llvm ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch new file mode 100644 index 0000000000..b5d0e7b417 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch @@ -0,0 +1,54 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 242df638f80d..a4654e96371f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -25,16 +25,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang from in-tree build") + else() + libomptarget_say("Not building DeviceRTL. No appropriate clang found") +diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +index 3f4c02671aeb..be9f4677d7b5 100644 +--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt ++++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +@@ -38,16 +38,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") + else() + libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch new file mode 100644 index 0000000000..352a469231 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f11a05f5622..fb90f8f6a49b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_STANDALONE_BUILD TRUE) + project(openmp C CXX) + ++ include(GNUInstallDirs) ++ + # CMAKE_BUILD_TYPE was not set, default to Release. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +index 0e1ce2afd154..8b3810f83713 100644 +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +index 16ce0891ca23..db30ee9c769f 100644 +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" +diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt +index e4f4e6e1e73f..1164b3b22b0e 100644 +--- a/runtime/src/CMakeLists.txt ++++ b/runtime/src/CMakeLists.txt +@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib + # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include + if(${OPENMP_STANDALONE_BUILD}) +- set(LIBOMP_HEADERS_INSTALL_PATH include) ++ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + else() + string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") + endif() + if(WIN32) +- install(TARGETS omp RUNTIME DESTINATION bin) ++ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") + # Create aliases (regular copies) of the library for backwards compatibility + set(LIBOMP_ALIASES "libiomp5md") +diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt +index 64317c112176..4002784da736 100644 +--- a/tools/multiplex/CMakeLists.txt ++++ b/tools/multiplex/CMakeLists.txt +@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) + add_library(ompt-multiplex INTERFACE) + target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +- install(FILES ompt-multiplex.h DESTINATION include) ++ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + add_subdirectory(tests) + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix index 3120426210..a7aa84a1aa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/myrddin/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 06b19b547b..4f3b200477 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix index de2dae156e..b521aaef10 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-02-22"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a"; + sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2"; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out diff --git a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 713b32a349..40681faae8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -66,7 +66,7 @@ let in let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre"; + pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; version = "${productVersion}u${patchVersion}"; src = 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 daa8a542b7..cbf3651646 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.14.5"; + version = "0.14.7"; # 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 = "1brvbpzr3cwls809fl0sjrm9cbh8v7maf5d7ic2mha0xapabgfpv"; + sha256 = "0pc07xv5h7jgiy04rcrnsjb97nk5zs7jrvcsqggn0izlnrcyi8rc"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1mvxvn30iyrq0ck6g08f925gxnnhbfgl29b2gjjsmm3m9mpll7ws"; + sha256 = "0vcjxb1v76wg4hmisnw0pp6wl0pwp4fa19cw08zdhgy62w06mqfa"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix index 0937ff8bd8..4404a51082 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix @@ -2,6 +2,9 @@ , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: +lib.throwIfNot (lib.versionOlder ocaml.version "4.13") + "reason is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; version = "3.7.0"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix index f479b05201..2071c48cc6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix @@ -31,5 +31,5 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 17ba5b1421..1dc910c622 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -18,8 +18,6 @@ let { "0.48" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; - "0.54" = ./disable-graphviz-0.46.1.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -87,13 +85,8 @@ let in rec { vala_0_48 = generic { - version = "0.48.22"; - sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; - }; - - vala_0_52 = generic { - version = "0.52.10"; - sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; + version = "0.48.23"; + sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo="; }; vala_0_54 = generic { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index fcaaaac615..56ce94ecc6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -34,10 +34,10 @@ mkCoqDerivation { "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; + extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; extraBuildInputs = lib.optional recent coq.ocamlPackages.num; propagatedBuildInputs = [ ssreflect ] - ++ lib.optionals recent [ coq-ext-lib simple-io ] - ++ lib.optional recent coq.ocamlPackages.ocamlbuild; + ++ lib.optionals recent [ coq-ext-lib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix index c6b6f79bf0..8a0248c952 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: with lib; @@ -17,7 +17,7 @@ mkCoqDerivation { { case = range "8.11" "8.12"; out = "0.4"; } ] null; - propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ]; + propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ]; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix index 1da0a0d17e..6cb6bb3c81 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix @@ -22,6 +22,7 @@ with lib; mkCoqDerivation { }; }; + extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ]; propagatedBuildInputs = [ mathcomp.algebra ]; installPhase = '' 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 c4055648c5..55423047ca 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 @@ -48,9 +48,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which elpi ]; mlPlugin = true; - extraBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix index 7cb859b202..66a3dd222d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -5,6 +5,7 @@ with lib; mkCoqDerivation { pname = "coqhammer"; owner = "lukaszcz"; defaultVersion = with versions; switch coq.coq-version [ + { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } { case = "8.12"; out = "1.3.2-coq8.12"; } @@ -13,6 +14,8 @@ with lib; mkCoqDerivation { { case = "8.9"; out = "1.1.1-coq8.9"; } { case = "8.8"; out = "1.1-coq8.8"; } ] null; + release."1.3.2-coq8.15".sha256 = "sha256:0n0y9wda8bx88r17ls9541ibxw013ghp73zshgb65bi7ibznbhha"; + release."1.3.2-coq8.15".rev = "9a3e689036f12c09800ca3bac05054af0cc49233"; release."1.3.2-coq8.14".sha256 = "sha256:1pvs4p95lr31jb86f33p2q9v8zq3xbci1fk6s6a2g2snfxng1574"; release."1.3.2-coq8.13".sha256 = "sha256:0krsm8qj9lgfbggxv2jhkbk3vy2cz63qypnarnl31fdmpykchi4b"; release."1.3.2-coq8.12".sha256 = "sha256:08mnr13lrdnpims6kf8pk6axf4s8qqs0a71hzg3frkx21d6nawhh"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix index 891d1fae62..c9c3915414 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; - buildInputs = with coq.ocamlPackages; [ ocaml findlib ]; + extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ]; meta = { license = licenses.lgpl3Only; 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 b7f5802b9d..1a6dba9b0c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; releaseRev = v: "coquelicot-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index 82fb6c536d..7cf6132bf6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -39,7 +39,7 @@ mkCoqDerivation { release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ autoreconfHook ]; + extraNativeBuildInputs = [ autoreconfHook ]; mlPlugin = true; extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 19d35b4c97..a9c5d02107 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Formal proof of the Four Color Theorem "; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix index c7c64c9d25..53c317db87 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -15,7 +15,7 @@ with lib; mkCoqDerivation { ] null; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; meta = { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index 440c9395a3..02905dcffe 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -12,7 +12,7 @@ with lib; mkCoqDerivation { release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; releaseRev = v: "gappalib-coq-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; mlPlugin = true; propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; 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 6374ede797..eedbe6fb5d 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,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: with lib; @@ -15,7 +15,7 @@ mkCoqDerivation { { case = range "8.13" "8.14"; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; meta = { 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 1f5a616bb5..c0fa2d7c8e 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 @@ -17,7 +17,7 @@ with lib; let hb = mkCoqDerivation { release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which ]; propagatedBuildInputs = [ coq-elpi ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix index e7dc7474e8..7977363d83 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix @@ -33,5 +33,5 @@ with lib; }; }).overrideAttrs(o: let inherit (o) version; in { - propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version) LibHyps; + propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; }) 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 b608f3d020..b9257d415e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }: mkCoqDerivation rec { pname = "interval"; @@ -20,8 +20,8 @@ mkCoqDerivation rec { release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; releaseRev = v: "interval-${v}"; - nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ] + extraNativeBuildInputs = [ which autoconf ]; + propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ] ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix index 4fceb7a2fd..7839c42067 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "3.5.0"; } + { case = range "8.13" "8.15"; out = "3.6.0"; } + { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix index 843a99de4b..af53599336 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix @@ -13,7 +13,7 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; meta = { 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 0f0937d1e4..0364ad0957 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 @@ -24,7 +24,14 @@ with lib; mkCoqDerivation { { cases = [ (isGe "8.7") "1.7.0" ]; out = "1.0.1"; } ] null; - propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.field mathcomp-bigenough ]; + propagatedBuildInputs = [ + mathcomp.ssreflect + mathcomp.algebra + mathcomp.field + mathcomp.fingroup + mathcomp.solvable + mathcomp-bigenough + ]; meta = { description = "Mathematical Components Library on real closed fields"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index 67f4c4ef78..9c74edd547 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation { { cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Yet Another Coq Library on Machine Words"; 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 ce2bd98f3d..2e2593669f 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 @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: with lib; mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; @@ -15,7 +15,7 @@ with lib; mkCoqDerivation rec { release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; meta = { description = "Micromega tactics for Mathematical Components"; 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 5b41d62d77..0f562fec28 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -59,10 +59,9 @@ let derivation = mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; - nativeBuildInputs = optionals withDoc [ graphviz lua ]; mlPlugin = versions.isLe "8.6" coq.coq-version; - extraBuildInputs = [ ncurses which ]; - propagatedBuildInputs = mathcomp-deps; + extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ]; + extraBuildInputs = [ ncurses ] ++ mathcomp-deps; buildFlags = optional withDoc "doc"; 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 a74ee17f1c..8144d87b9f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -38,7 +38,7 @@ with lib; mkCoqDerivation { ''; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp.fingroup mathcomp-bigenough ]; meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix index 2009034063..0d2005326c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix @@ -16,7 +16,15 @@ mkCoqDerivation { { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } ] null; - propagatedBuildInputs = [ mathcomp.character ]; + propagatedBuildInputs = [ + mathcomp.character + mathcomp.ssreflect + mathcomp.fingroup + mathcomp.algebra + mathcomp.solvable + mathcomp.field + mathcomp.all + ]; meta = { description = "Formal proof of the Odd Order Theorem"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix index 9b8bb10a5f..89567d401b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -24,7 +24,8 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ num ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraBuildInputs = (with coq.ocamlPackages; [ num ]); postPatch = '' for p in Make Makefile.coq.local diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index 3631bdd54b..693ff2b01d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; - extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); propagatedBuildInputs = [ coq-ext-lib ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 097293d581..3f6e20c5d7 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "1.6.0"; } + { case = range "8.13" "8.15"; out = "1.7.0"; } + { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix index 31255aaca5..f19458fa84 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -9,54 +9,32 @@ let python = python3.override { packageOverrides = self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - version = "0.8.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = "aiofiles"; - rev = "v${version}"; - sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap"; - }; - }); - - asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec { - version = "3.4.1"; - src = fetchFromGitHub { - owner = "django"; - repo = "asgiref"; - rev = version; - sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39"; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "8.0.3"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "click"; - rev = version; - sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g"; + semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { + version = "2.9.0"; + src = fetchPypi { + pname = "semantic_version"; + version = version; + sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb"; }; }); starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "encode"; repo = "starlette"; rev = version; - sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw"; + sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p"; }; - disabledTestPaths = []; }); uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp"; }; }); }; @@ -80,6 +58,7 @@ with python.pkgs; buildPythonApplication rec { pyserial requests semantic-version + spdx-license-list-data.json starlette tabulate uvicorn @@ -171,7 +150,7 @@ with python.pkgs; buildPythonApplication rec { postPatch = '' substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ --replace "zeroconf==0.37.*" "zeroconf" @@ -180,7 +159,7 @@ with python.pkgs; buildPythonApplication rec { meta = with lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = "http://platformio.org"; + homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix index 5bbc549163..31b7b8d495 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.2.4"; + version = "5.2.5"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9"; + sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy"; }; self = { diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch index 46e84d15a8..fe7f9f127a 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch @@ -2,7 +2,7 @@ diff --git a/platformio/proc.py b/platformio/proc.py index 80e50201..15cee5a5 100644 --- a/platformio/proc.py +++ b/platformio/proc.py -@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv(): +@@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index b560189028..342fb120a0 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.15" +- version = "3.16" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 9652a95ee2..7c0b1802ba 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Development;"; + categories = [ "Development" ]; comment = "STM32Cube initialization code generator"; icon = "stm32cubemx"; }) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index e9ce4f1270..86f29e7311 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -124,20 +124,17 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; - in buildPackages.stdenv.mkDerivation { - name = "cabal2nix-${name}"; + in buildPackages.runCommand "cabal2nix-${name}" { nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; - phases = ["installPhase"]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" - ''; - }; + } '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + ''; all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/array.nix b/third_party/nixpkgs/pkgs/development/idris-modules/array.nix index faed6443c4..ef8159e9a8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/array.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/array.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "array"; + pname = "array"; version = "2016-10-14"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/bi.nix b/third_party/nixpkgs/pkgs/development/idris-modules/bi.nix index 51f6497e18..ec1f9a13bc 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/bi.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/bi.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "bi"; + pname = "bi"; version = "2018-06-25"; ipkgName = "Bi"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/bifunctors.nix b/third_party/nixpkgs/pkgs/development/idris-modules/bifunctors.nix index 15c7a6dd01..3461bb37fd 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/bifunctors.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/bifunctors.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bifunctors"; + pname = "bifunctors"; version = "2017-02-07"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix b/third_party/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix index ff19e52135..fe23728e08 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,13 +1,13 @@ # Build one of the packages that comes with idris -# name: The name of the package +# pname: The pname of the package # deps: The dependencies of the package -{ idris, build-idris-package }: name: deps: +{ idris, build-idris-package }: pname: deps: let inherit (builtins.parseDrvName idris.name) version; in build-idris-package { - inherit name version; + inherit pname version; inherit (idris) src; noPrelude = true; @@ -16,10 +16,10 @@ build-idris-package { idrisDeps = deps; postUnpack = '' - sourceRoot=$sourceRoot/libs/${name} + sourceRoot=$sourceRoot/libs/${pname} ''; meta = idris.meta // { - description = "${name} builtin Idris library"; + description = "${pname} builtin Idris library"; }; } diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix b/third_party/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix index 7869c27069..b21826eac3 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix @@ -3,9 +3,9 @@ { idrisDeps ? [] , noPrelude ? false , noBase ? false - , name + , pname , version - , ipkgName ? name + , ipkgName ? pname , extraBuildInputs ? [] , idrisBuildOptions ? [] , idrisTestOptions ? [] @@ -20,7 +20,7 @@ let idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" - "name" "version" "ipkgName" "extraBuildInputs" + "pname" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idris.meta.platforms; @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation ({ - name = "idris-${name}-${version}"; + pname = "idris-${pname}"; + inherit version; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/bytes.nix b/third_party/nixpkgs/pkgs/development/idris-modules/bytes.nix index eaff512d5d..0fd9b05f88 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/bytes.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/bytes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bytes"; + pname = "bytes"; version = "2018-02-10"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/canvas.nix b/third_party/nixpkgs/pkgs/development/idris-modules/canvas.nix index 77851c8717..3c74879eab 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/canvas.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/canvas.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "canvas"; + pname = "canvas"; version = "2017-11-09"; ipkgName = "idriscanvas"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/categories.nix b/third_party/nixpkgs/pkgs/development/idris-modules/categories.nix index adbe6d4f8a..0c64218bcd 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/categories.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/categories.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "categories"; + pname = "categories"; version = "2018-07-02"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/coda.nix b/third_party/nixpkgs/pkgs/development/idris-modules/coda.nix index ecd7af4436..d1529ceb99 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/coda.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/coda.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "coda"; + pname = "coda"; version = "2018-01-25"; ipkgName = "Coda"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/comonad.nix b/third_party/nixpkgs/pkgs/development/idris-modules/comonad.nix index 31fd8dbc9a..d7bf499ea2 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/comonad.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/comonad.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "comonad"; + pname = "comonad"; version = "2018-02-26"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/composition.nix b/third_party/nixpkgs/pkgs/development/idris-modules/composition.nix index 5d6d2f891a..831a1f3265 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/composition.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/composition.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "composition"; + pname = "composition"; version = "2017-11-12"; idrisDeps = [ hezarfen ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/config.nix b/third_party/nixpkgs/pkgs/development/idris-modules/config.nix index 3771313d17..49c6efdd73 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/config.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/config.nix @@ -7,7 +7,7 @@ , lib }: build-idris-package { - name = "config"; + pname = "config"; version = "2017-11-06"; idrisDeps = [ effects containers lightyear test ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/console.nix b/third_party/nixpkgs/pkgs/development/idris-modules/console.nix index e60ac20f4d..30cefa4581 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/console.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/console.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "console"; + pname = "console"; version = "2017-04-20"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/containers.nix b/third_party/nixpkgs/pkgs/development/idris-modules/containers.nix index e98285ca93..dfe85aa7b8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/containers.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/containers.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "containers"; + pname = "containers"; version = "2017-09-10"; idrisDeps = [ effects test ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/cube.nix b/third_party/nixpkgs/pkgs/development/idris-modules/cube.nix index 8a0f66829d..eac71fb879 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/cube.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/cube.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "cube"; + pname = "cube"; version = "2017-07-05"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/derive.nix b/third_party/nixpkgs/pkgs/development/idris-modules/derive.nix index 7ab87d71d0..1ceca662e8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/derive.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/derive.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "derive"; + pname = "derive"; version = "2018-07-02"; idrisDeps = [ contrib pruviloj ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/descncrunch.nix b/third_party/nixpkgs/pkgs/development/idris-modules/descncrunch.nix index 95f49a524b..3c82e23ec7 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/descncrunch.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/descncrunch.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "descncrunch"; + pname = "descncrunch"; version = "2017-11-15"; idrisDeps = [ pruviloj ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/dict.nix b/third_party/nixpkgs/pkgs/development/idris-modules/dict.nix index 24cc7c0359..3aa15287bd 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/dict.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/dict.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "dict"; + pname = "dict"; version = "2016-12-26"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/dom.nix b/third_party/nixpkgs/pkgs/development/idris-modules/dom.nix index f88827fb26..2698cbab48 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/dom.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/dom.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "dom"; + pname = "dom"; version = "2017-04-22"; idrisDeps = [ idrisscript html xhr ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/electron.nix b/third_party/nixpkgs/pkgs/development/idris-modules/electron.nix index 172f1980a9..769b0b3fe8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/electron.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/electron.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "electron"; + pname = "electron"; version = "2016-03-07"; idrisDeps = [ contrib jheiling-extras jheiling-js ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/eternal.nix b/third_party/nixpkgs/pkgs/development/idris-modules/eternal.nix index 673df485a3..9ca38907fe 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/eternal.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/eternal.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "eternal"; + pname = "eternal"; version = "2018-07-02"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/farrp.nix b/third_party/nixpkgs/pkgs/development/idris-modules/farrp.nix index 88f852ba20..4326aeeadb 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/farrp.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/farrp.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "farrp"; + pname = "farrp"; version = "2018-02-13"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/free.nix b/third_party/nixpkgs/pkgs/development/idris-modules/free.nix index 6f7a5f56d4..557dc30ff9 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/free.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/free.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "free"; + pname = "free"; version = "2017-07-03"; ipkgName = "idris-free"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/fsm.nix b/third_party/nixpkgs/pkgs/development/idris-modules/fsm.nix index 5da5f01da3..1342e90f29 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/fsm.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/fsm.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "fsm"; + pname = "fsm"; version = "2017-04-16"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/glfw.nix b/third_party/nixpkgs/pkgs/development/idris-modules/glfw.nix index c63cf8acb0..f67b65bb71 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/glfw.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/glfw.nix @@ -5,7 +5,7 @@ , pkgs }: build-idris-package { - name = "glfw"; + pname = "glfw"; version = "2016-12-05"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/graphviz.nix b/third_party/nixpkgs/pkgs/development/idris-modules/graphviz.nix index 650f0e0b99..28ab24a2ad 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/graphviz.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/graphviz.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "graphviz"; + pname = "graphviz"; version = "2017-01-16"; idrisDeps = [ lightyear ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/hamt.nix b/third_party/nixpkgs/pkgs/development/idris-modules/hamt.nix index 3c6868fcc5..97a72e8c90 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/hamt.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "hamt"; + pname = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/hezarfen.nix b/third_party/nixpkgs/pkgs/development/idris-modules/hezarfen.nix index acbc2770ea..881b65b2b8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/hezarfen.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/hezarfen.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "hezarfen"; + pname = "hezarfen"; version = "2018-02-03"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/hrtime.nix b/third_party/nixpkgs/pkgs/development/idris-modules/hrtime.nix index 7f4d0769cc..3d1c0f4abf 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/hrtime.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/hrtime.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "hrtime"; + pname = "hrtime"; version = "2017-04-16"; ipkgName = "hrTime"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/html.nix b/third_party/nixpkgs/pkgs/development/idris-modules/html.nix index 2ab7534936..8eb2f7f12d 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/html.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/html.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "html"; + pname = "html"; version = "2017-04-23"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/http.nix b/third_party/nixpkgs/pkgs/development/idris-modules/http.nix index 45e505be05..d952dca54a 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/http.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/http.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "http"; + pname = "http"; version = "2018-02-25"; idrisDeps = [ contrib lightyear bytes ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/http4idris.nix b/third_party/nixpkgs/pkgs/development/idris-modules/http4idris.nix index 11e9d62c05..6959e33f48 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/http4idris.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/http4idris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "http4idris"; + pname = "http4idris"; version = "2018-01-16"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/iaia.nix b/third_party/nixpkgs/pkgs/development/idris-modules/iaia.nix index 865d533750..1c631280ea 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/iaia.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/iaia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "iaia"; + pname = "iaia"; version = "2017-11-10"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix b/third_party/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix index 6b1ae30ad4..759ea35474 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idrishighlighter"; + pname = "idrishighlighter"; version = "2018-02-22"; ipkgName = "idris-code-highlighter"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/idrisscript.nix b/third_party/nixpkgs/pkgs/development/idris-modules/idrisscript.nix index 805facda84..2a2693c623 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/idrisscript.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/idrisscript.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "idrisscript"; + pname = "idrisscript"; version = "2017-07-01"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix b/third_party/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix index 6bdcd9e9f5..4cd966d8b8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "ipkgparser"; + pname = "ipkgparser"; version = "2017-11-14"; idrisDeps = [ contrib effects lightyear ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix b/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix index ae933b264a..da84ea2680 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "extras"; + pname = "extras"; version = "2018-03-06"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix b/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix index b192e8ff1c..425acceb4e 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "jheiling-js"; + pname = "jheiling-js"; version = "2016-03-09"; ipkgName = "js"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/js.nix b/third_party/nixpkgs/pkgs/development/idris-modules/js.nix index 61ce415e60..4b96ca1a48 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/js.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "js"; + pname = "js"; version = "2018-11-27"; idrisDeps = [ contrib pruviloj ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/lens.nix b/third_party/nixpkgs/pkgs/development/idris-modules/lens.nix index e829309fbc..c9a8c2aa25 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/lens.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/lens.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lens"; + pname = "lens"; version = "2017-09-25"; idrisDeps = [ bifunctors ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/lightyear.nix b/third_party/nixpkgs/pkgs/development/idris-modules/lightyear.nix index 34c19eea4a..e8f94a82d2 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/lightyear.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/lightyear.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lightyear"; + pname = "lightyear"; version = "2017-09-10"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/logic.nix b/third_party/nixpkgs/pkgs/development/idris-modules/logic.nix index 35670462dc..f20d16e9a1 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/logic.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/logic.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "logic"; + pname = "logic"; version = "2016-12-02"; idrisDeps = [ bifunctors ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/mapping.nix b/third_party/nixpkgs/pkgs/development/idris-modules/mapping.nix index 6f978fccd5..fbfb34ddbf 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/mapping.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/mapping.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "mapping"; + pname = "mapping"; version = "2018-02-27"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/mhd.nix b/third_party/nixpkgs/pkgs/development/idris-modules/mhd.nix index 1ef304bbf1..dc3a05f2b5 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/mhd.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/mhd.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "mhd"; + pname = "mhd"; version = "2016-04-22"; ipkgName = "MHD"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/pacman.nix b/third_party/nixpkgs/pkgs/development/idris-modules/pacman.nix index cda3662dce..dbc3c9ced7 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/pacman.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/pacman.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "pacman"; + pname = "pacman"; version = "2017-11-10"; idrisDeps = [ contrib sdl2 ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/patricia.nix b/third_party/nixpkgs/pkgs/development/idris-modules/patricia.nix index 586c33837d..a5cb0c6af0 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/patricia.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/patricia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "patricia"; + pname = "patricia"; version = "2017-10-27"; idrisDeps = [ specdris ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/permutations.nix b/third_party/nixpkgs/pkgs/development/idris-modules/permutations.nix index b11bce39e1..6f4e299d22 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/permutations.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/permutations.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "permutations"; + pname = "permutations"; version = "2018-01-19"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/pfds.nix b/third_party/nixpkgs/pkgs/development/idris-modules/pfds.nix index d82ec49018..db3004a72b 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/pfds.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/pfds.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "pfds"; + pname = "pfds"; version = "2017-09-25"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/pipes.nix b/third_party/nixpkgs/pkgs/development/idris-modules/pipes.nix index 69b8d72170..1402a2face 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/pipes.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/pipes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "pipes"; + pname = "pipes"; version = "2017-12-02"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/posix.nix b/third_party/nixpkgs/pkgs/development/idris-modules/posix.nix index 30bff9eb7e..1358815598 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/posix.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/posix.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "posix"; + pname = "posix"; version = "2017-11-18"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/quantities.nix b/third_party/nixpkgs/pkgs/development/idris-modules/quantities.nix index 8141465d75..76242c5d22 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/quantities.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/quantities.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "quantities"; + pname = "quantities"; version = "2018-04-17"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/rationals.nix b/third_party/nixpkgs/pkgs/development/idris-modules/rationals.nix index 91aa294d1c..9513b79e1a 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/rationals.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/rationals.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "rationals"; + pname = "rationals"; version = "2017-04-29"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix b/third_party/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix index b326113c63..3e9510563e 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix @@ -8,7 +8,7 @@ , lib }: build-idris-package { - name = "recursion_schemes"; + pname = "recursion_schemes"; version = "2018-01-19"; idrisDeps = [ free composition comonad bifunctors hezarfen ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/refined.nix b/third_party/nixpkgs/pkgs/development/idris-modules/refined.nix index 11fd6b7828..c841f633b4 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/refined.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/refined.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "refined"; + pname = "refined"; version = "2017-12-28"; ipkgName = "idris-refined"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/sdl.nix b/third_party/nixpkgs/pkgs/development/idris-modules/sdl.nix index 105cfdce65..59e3ac916e 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/sdl.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/sdl.nix @@ -6,7 +6,7 @@ , SDL_gfx }: build-idris-package { - name = "sdl"; + pname = "sdl"; version = "2017-03-24"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix b/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix index 2e06b03682..36eb7395dd 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/sdl2.nix @@ -7,7 +7,7 @@ , SDL2_gfx }: build-idris-package rec { - name = "sdl2"; + pname = "sdl2"; version = "0.1.1"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/semidirect.nix b/third_party/nixpkgs/pkgs/development/idris-modules/semidirect.nix index 30cc144003..e3ca18fd2a 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/semidirect.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/semidirect.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "semidirect"; + pname = "semidirect"; version = "2018-07-02"; idrisDeps = [ contrib patricia ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/setoids.nix b/third_party/nixpkgs/pkgs/development/idris-modules/setoids.nix index aa66d84759..49e7bc5e8a 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/setoids.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/setoids.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "setoids"; + pname = "setoids"; version = "2018-06-18"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/smproc.nix b/third_party/nixpkgs/pkgs/development/idris-modules/smproc.nix index 4917f76285..b3780c9af3 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/smproc.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/smproc.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "smproc"; + pname = "smproc"; version = "2018-02-08"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/snippets.nix b/third_party/nixpkgs/pkgs/development/idris-modules/snippets.nix index 2d5473545c..fa4f3226dc 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/snippets.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/snippets.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "snippets"; + pname = "snippets"; version = "2018-03-17"; ipkgName = "idris-snippets"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/software_foundations.nix b/third_party/nixpkgs/pkgs/development/idris-modules/software_foundations.nix index 0f45da3ed6..cbbf959576 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/software_foundations.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/software_foundations.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "software_foundations"; + pname = "software_foundations"; version = "2017-11-04"; idrisDeps = [ pruviloj ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/specdris.nix b/third_party/nixpkgs/pkgs/development/idris-modules/specdris.nix index b20902d743..172a46b65a 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/specdris.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/specdris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "specdris"; + pname = "specdris"; version = "2018-01-23"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tap.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tap.nix index 9edbbaea35..8db71b9cb0 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tap.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tap.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tap"; + pname = "tap"; version = "2017-04-08"; ipkgName = "TAP"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/test.nix b/third_party/nixpkgs/pkgs/development/idris-modules/test.nix index 073b4e20b8..9c14422cc8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/test.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/test.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "test"; + pname = "test"; version = "2017-03-30"; idrisDeps = [ effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tfrandom.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tfrandom.nix index 8249259075..b07f525300 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tfrandom.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tfrandom.nix @@ -4,7 +4,7 @@ }: build-idris-package { - name = "tf-random"; + pname = "tf-random"; version = "2020-01-15"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tlhydra.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tlhydra.nix index e2c07ac5fb..3b33367c88 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tlhydra.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tlhydra.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "tlhydra"; + pname = "tlhydra"; version = "2017-13-26"; idrisDeps = [ effects contrib lightyear ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tomladris.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tomladris.nix index 64728ab305..8a0e7847f5 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tomladris.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tomladris.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "tomladris"; + pname = "tomladris"; version = "2017-11-14"; idrisDeps = [ lightyear contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tp.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tp.nix index 0cfdc78f66..0aedc3f485 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tp.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tp.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "tp"; + pname = "tp"; version = "2017-08-15"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/tparsec.nix b/third_party/nixpkgs/pkgs/development/idris-modules/tparsec.nix index ce040bebe3..ddf24f7c9d 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/tparsec.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/tparsec.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tparsec"; + pname = "tparsec"; version = "2020-02-11"; ipkgName = "TParsec"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/transducers.nix b/third_party/nixpkgs/pkgs/development/idris-modules/transducers.nix index 39a4cdf0cc..455e5c72a6 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/transducers.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/transducers.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "transducers"; + pname = "transducers"; version = "2017-07-28"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/trees.nix b/third_party/nixpkgs/pkgs/development/idris-modules/trees.nix index 8fda8d138a..5c6e69471c 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/trees.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/trees.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "trees"; + pname = "trees"; version = "2018-03-19"; idrisDeps = [ contrib bi ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/union_type.nix b/third_party/nixpkgs/pkgs/development/idris-modules/union_type.nix index 2ad8f280fc..99f160a72d 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/union_type.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/union_type.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "union_type"; + pname = "union_type"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/vdom.nix b/third_party/nixpkgs/pkgs/development/idris-modules/vdom.nix index 3ece0056a3..9e3f151ee8 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/vdom.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/vdom.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "vdom"; + pname = "vdom"; version = "0.6.0"; ipkgName = "idris-vdom"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/vecspace.nix b/third_party/nixpkgs/pkgs/development/idris-modules/vecspace.nix index 2336291338..dea3c9b18d 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/vecspace.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/vecspace.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "vecspace"; + pname = "vecspace"; version = "2018-01-12"; idrisDeps = [ contrib ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/webgl.nix b/third_party/nixpkgs/pkgs/development/idris-modules/webgl.nix index 271501aa52..849cad2590 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/webgl.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/webgl.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "webgl"; + pname = "webgl"; version = "2017-05-08"; idrisDeps = [ idrisscript ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix b/third_party/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix index a368e0582d..a6c7b78f55 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "wl-pprint"; + pname = "wl-pprint"; version = "2017-03-13"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/wyvern.nix b/third_party/nixpkgs/pkgs/development/idris-modules/wyvern.nix index 750b5dd2fd..3a8742d9fe 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/wyvern.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/wyvern.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "wyvern"; + pname = "wyvern"; version = "2017-06-26"; idrisDeps = [ contrib effects ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/xhr.nix b/third_party/nixpkgs/pkgs/development/idris-modules/xhr.nix index 9c198e2893..e8dc37d439 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/xhr.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/xhr.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "xhr"; + pname = "xhr"; version = "2017-04-22"; idrisDeps = [ idrisscript ]; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/yaml.nix b/third_party/nixpkgs/pkgs/development/idris-modules/yaml.nix index b7fffd3953..2c8b808757 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/yaml.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/yaml.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "yaml"; + pname = "yaml"; version = "2018-01-25"; ipkgName = "Yaml"; diff --git a/third_party/nixpkgs/pkgs/development/idris-modules/yampa.nix b/third_party/nixpkgs/pkgs/development/idris-modules/yampa.nix index 33ebacc6d5..ae790aa4bd 100644 --- a/third_party/nixpkgs/pkgs/development/idris-modules/yampa.nix +++ b/third_party/nixpkgs/pkgs/development/idris-modules/yampa.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "yampa"; + pname = "yampa"; version = "2016-07-05"; ipkgName = "idris-yampa"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 9cdde90c41..3379d1370a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -1,22 +1,24 @@ { resholvePackage , lib +, stdenv , fetchFromGitHub , bash , coreutils , gnugrep , ncurses +, lsof , doInstallCheck ? true }: resholvePackage rec { pname = "bats"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; + sha256 = "sha256-s+SAqX70WeTz6s5ObXYFBVPVUEqvD1d7AX2sGHkjVQ4="; }; patchPhase = '' @@ -45,7 +47,7 @@ resholvePackage rec { }; inherit doInstallCheck; - installCheckInputs = [ ncurses ]; + installCheckInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ lsof ]; installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix index 2a387d34f4..926308f0d3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -24,11 +24,11 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.49"; - name = "clisp-${v}"; + version = "2.49"; + pname = "clisp"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clisp/hg.nix b/third_party/nixpkgs/pkgs/development/interpreters/clisp/hg.nix index 7ab4134fac..7b10d2cad0 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clisp/hg.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clisp/hg.nix @@ -23,8 +23,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.50pre20171114"; - name = "clisp-${v}"; + version = "2.50pre20171114"; + pname = "clisp"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index ca2391ebd2..ce15fe4c5a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.5"; + version = "0.7.7"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-ap6YCRUqtIgh36eTIk5BSjUildvYhqkC48Y4dxNMU8c="; + sha256 = "sha256-4aYYm2gCtfp+OiY6ouaTn4giHbX6JyULBHMpDnGMpbs="; }; executable = "bb"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index a66f0422b6..09774f7fb6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1082"; + version = "1.10.3.1087"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-8hW8zgP+D72MtXYFPXx9FfkThQuCBo1Y6CU5w7xPE7c="; + sha256 = "sha256-prOzVHrcbabKXP4Q4Dfx/eiKePlINyu1mO9NCFnaPpQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 7fe1b46e3a..f7c730c927 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -24,7 +24,6 @@ lib.makePackageOverridable code = "${src}/${file}"; } - // lib.optionalAttrs document { documentationRoot = src; } + // lib.optionalAttrs document { documentationRoot = "${src}"; } ) ) - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix index ba533a1727..912fc691dd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "duktape"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; + sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; nativeBuildInputs = [ validatePkgConfig ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index f4f7d64835..667fb749d3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation ({ #!${stdenv.shell} set -ox errexit PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} - latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index bd6f2545b3..efe9640af6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , glib @@ -14,20 +13,39 @@ , dbus , ninja , python3 +, vala , gettext }: stdenv.mkDerivation rec { pname = "accountsservice"; - version = "0.6.55"; + version = "22.08.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E="; }; + patches = [ + # Hardcode dependency paths. + (substituteAll { + src = ./fix-paths.patch; + inherit shadow coreutils; + }) + + # Do not try to create directories in /var, that will not work in Nix sandbox. + ./no-create-dirs.patch + + # Disable mutating D-Bus methods with immutable /etc. + ./Disable-methods-that-change-files-in-etc.patch + + # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme. + # Fixes https://github.com/NixOS/nixpkgs/issues/72396 + ./drop-prefix-check-extensions.patch + ]; + nativeBuildInputs = [ dbus gettext @@ -36,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + vala ]; buildInputs = [ @@ -48,7 +67,6 @@ stdenv.mkDerivation rec { "-Dadmin_group=wheel" "-Dlocalstatedir=/var" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dsystemd=true" ]; postPatch = '' @@ -56,42 +74,11 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - patches = [ - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/55 - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/58.patch"; - sha256 = "1pnwq4ycnryb2kkgvnz44qzm71240ybqj6507wynlkdsw8180fdw"; - }) - (substituteAll { - src = ./fix-paths.patch; - inherit shadow coreutils; - }) - ./no-create-dirs.patch - ./Disable-methods-that-change-files-in-etc.patch - # Fixes https://github.com/NixOS/nixpkgs/issues/72396 - ./drop-prefix-check-extensions.patch - # Systemd unit improvements. Notably using StateDirectory eliminating the - # need of an ad-hoc script. - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/152b845bbd3ca2a64516691493a160825f1a2046.patch"; - sha256 = "114wrf5mwj5bgc5v1g05md4ridcnwdrwppr3bjz96sknwh5hk8s5"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/0e712e935abd26499ff5995ab363e5bfd9ee7c4c.patch"; - sha256 = "1y60a5fmgfqjzprwpizilrazqn3mggdlgc5sgcpsprsp62fv78rl"; - }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/ced73d0fcbd2a54085a660d260482fc70d79bd5c.patch"; - sha256 = "0s7fknfgxl8hnf6givmhfg4586fjb2n64i9arh1w7xnq7x9x8d4c"; - }) - ]; - meta = with lib; { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3Plus; + maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]); platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch index 78d7a8081b..0ed8e04579 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon.c b/src/daemon.c -index c52bda3..75d214e 100644 +index c8b6320..2b74949 100644 --- a/src/daemon.c +++ b/src/daemon.c -@@ -1106,7 +1106,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, +@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, sys_log (context, "create user '%s'", cd->user_name); @@ -11,9 +11,9 @@ index c52bda3..75d214e 100644 argv[1] = "-m"; argv[2] = "-c"; argv[3] = cd->real_name; -@@ -1318,7 +1318,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, - - user_set_saved (user, FALSE); +@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, + } + free (resolved_homedir); - argv[0] = "/usr/sbin/userdel"; + argv[0] = "@shadow@/bin/userdel"; @@ -21,19 +21,19 @@ index c52bda3..75d214e 100644 argv[1] = "-f"; argv[2] = "-r"; diff --git a/src/user.c b/src/user.c -index 9f57af5..e65289d 100644 +index 189b2c5..5358c02 100644 --- a/src/user.c +++ b/src/user.c -@@ -844,7 +844,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - name); +@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, + new_gecos = g_strdup (name); + } - argv[0] = "/usr/sbin/usermod"; + argv[0] = "@shadow@/bin/usermod"; argv[1] = "-c"; - argv[2] = name; + argv[2] = new_gecos; argv[3] = "--"; -@@ -913,7 +913,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, +@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), name); @@ -42,7 +42,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-l"; argv[2] = name; argv[3] = "--"; -@@ -1321,7 +1321,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, +@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), home_dir); @@ -51,7 +51,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-m"; argv[2] = "-d"; argv[3] = home_dir; -@@ -1378,7 +1378,7 @@ user_change_shell_authorized_cb (Daemon *daemon, +@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), shell); @@ -60,7 +60,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -1520,7 +1520,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, +@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, return; } @@ -69,7 +69,7 @@ index 9f57af5..e65289d 100644 argv[1] = filename; argv[2] = NULL; -@@ -1601,7 +1601,7 @@ user_change_locked_authorized_cb (Daemon *daemon, +@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon, locked ? "locking" : "unlocking", accounts_user_get_user_name (ACCOUNTS_USER (user)), accounts_user_get_uid (ACCOUNTS_USER (user))); @@ -78,7 +78,7 @@ index 9f57af5..e65289d 100644 argv[1] = locked ? "-L" : "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1726,7 +1726,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, +@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, g_free (groups); @@ -87,7 +87,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-G"; argv[2] = str->str; argv[3] = "--"; -@@ -1794,7 +1794,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, if (mode == PASSWORD_MODE_SET_AT_LOGIN || mode == PASSWORD_MODE_NONE) { @@ -96,7 +96,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1806,7 +1806,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, } if (mode == PASSWORD_MODE_SET_AT_LOGIN) { @@ -105,7 +105,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "0"; argv[3] = "--"; -@@ -1827,7 +1827,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { @@ -114,7 +114,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1905,7 +1905,7 @@ user_change_password_authorized_cb (Daemon *daemon, +@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon, g_object_freeze_notify (G_OBJECT (user)); diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch index 0333f925d2..5d137eb52a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,15 +1,17 @@ diff --git a/meson_post_install.py b/meson_post_install.py -index 5cc2dc4..dd27ad5 100644 +index d8c3dd1..620f714 100644 --- a/meson_post_install.py +++ b/meson_post_install.py -@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) +@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) # FIXME: meson will not track the creation of these directories # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 dst_dirs = [ +- (os.path.join(localstatedir, 'lib'), 0o755), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ++ # (os.path.join(localstatedir, 'lib'), 0o755), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ] for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 16fb32cf01..1001dc6267 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q1.1"; + version = "2022.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "jdAFIC2JYPqCADx/73KM6E3rLFWF4SlEdY9lCK1NOhU="; + sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng="; }; buildInputs = [ 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 274a35c6cc..806df81a70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -19,7 +19,6 @@ , grpc , gtest , jemalloc -, libnsl , lz4 , minio , ninja @@ -39,7 +38,7 @@ , zlib , zstd , enableShared ? !stdenv.hostPlatform.isStatic -, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableFlight ? true , enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions @@ -129,7 +128,6 @@ stdenv.mkDerivation rec { python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc - libnsl openssl protobuf ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 7ff60b9659..743740fddb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.8.2"; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k"; + sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix index c0765922de..7a3c8bc727 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -10,13 +12,21 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.88"; + version = "0.1.90"; outputs = [ "out" "dev" ]; + patches = [ + # Fix darwin build + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; + sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; + }) + ]; + src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; + sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; }; nativeBuildInputs = [ @@ -34,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Image pixel format conversion library"; homepage = "https://gegl.org/babl/"; + changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix index 406ff81fe8..96b677b27b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv -, pantheon -, autoconf -, automake -, libtool +{ stdenv +, lib +, autoreconfHook +, gitUpdater , gnome , which , fetchgit @@ -23,26 +22,24 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = "${version}+21.10.20210710-0ubuntu1"; - sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; + rev = version; + sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoconf - automake + autoreconfHook dbus docbook_xsl gnome.gnome-common gobject-introspection gtk-doc - libtool pkg-config vala which @@ -69,22 +66,23 @@ stdenv.mkDerivation rec { "--enable-headless-tests" ]; - # fix paths + # Fix paths makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - preConfigure = '' - ./autogen.sh - ''; - # TODO: Requires /etc/machine-id doCheck = false; - # glib-2.62 deprecations + # Ignore deprecation errors NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ".ubuntu.*"; + }; + meta = with lib; { description = "Application matching framework"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index b25688acfa..599ac2b2e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,19 +1,25 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.2"; + version = "0.29.0.gfm.3"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; + sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; }; nativeBuildInputs = [ cmake ]; # tests load the library dynamically which for unknown reason failed doCheck = false; + # remove when https://github.com/github/cmark-gfm/pull/248 merged and released + postInstall = '' + substituteInPlace $out/include/cmark-gfm-core-extensions.h \ + --replace '#include "config.h"' '#include ' + ''; + meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/github/cmark-gfm"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index eb14a44e4f..748e1e756c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko wucke13 ]; + maintainers = with maintainers; [ joko ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix index 7258cb767e..432e762615 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb"; + sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix index 7cbeffd5b7..69b330f5a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0="; + hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = []; description = "MIDI libraries for Qt5/C++"; - homepage = "http://drumstick.sourceforge.net/"; + homepage = "https://drumstick.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index d970f376d0..f352714d23 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -103,6 +103,15 @@ stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; + postFixup = '' + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \ + "set(_IMPORT_PREFIX \"$out\")" \ + "set(_IMPORT_PREFIX \"$static\")" + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \ + "$lib/lib/libexiv2-xmp.a" \ + "$static/lib/libexiv2-xmp.a" + ''; + disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix index 322c6ecebb..9e913fdf52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchurl, lib }: +{ lib +, stdenv +, fetchurl +# for passthru.tests +, python3 +, perlPackages +, haskellPackages +, luaPackages +, ocamlPackages +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -34,6 +43,14 @@ stdenv.mkDerivation rec { --replace "$"'{_IMPORT_PREFIX}' $out ''; + passthru.tests = { + inherit python3; + inherit (haskellPackages) hexpat; + inherit (perlPackages) XMLSAXExpat XMLParser; + inherit (luaPackages) luaexpat; + inherit (ocamlPackages) ocaml_expat; + }; + meta = with lib; { homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/febio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/febio/default.nix new file mode 100644 index 0000000000..4d01bf52bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/febio/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 +, mklSupport ? true, mkl +}: + +stdenv.mkDerivation rec { + pname = "FEBio"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; + }; + + patches = [ + ./fix-cmake.patch # cannot find mkl libraries without this + ]; + + cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" + ++ lib.optional mklSupport "-DMKLROOT=${mkl}" + ; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -R lib bin $out/ + cp -R ../FECore \ + ../FEBioFluid \ + ../FEBioLib \ + ../FEBioMech \ + ../FEBioMix \ + ../FEBioOpt \ + ../FEBioPlot \ + ../FEBioXML \ + ../NumCore \ + $out/include + + runHook postInstall + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] + ++ lib.optional mklSupport mkl + ; + + meta = { + description = "FEBio Suite Solver"; + license = with lib.licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scriptkiddi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch b/third_party/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch new file mode 100644 index 0000000000..5af10a0b39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) + find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib + PATHS ${${libDir}} NO_DEFAULT_PATH) + else() +- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a ++ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so + PATHS ${${libDir}} NO_DEFAULT_PATH) + endif() + +diff --git a/FindDependencies.cmake b/FindDependencies.cmake +index 2d644005f..7261ba923 100644 +--- a/FindDependencies.cmake ++++ b/FindDependencies.cmake +@@ -46,8 +46,8 @@ if(MKLROOT) + NO_DEFAULT_PATH) + + find_library(MKL_OMP_LIB +- NAMES iomp5 iomp5md libiomp5md.lib +- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib ++ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib ++ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib + PATH_SUFFIXES "intel64" "intel32" + NO_DEFAULT_PATH + DOC "MKL OMP Library") diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index c97f1effd6..88188f8d0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.4"; + version = "1.12.6"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch b/third_party/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch index 63ce0d12fe..6b8017684d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8d52d3a5..81700183 100644 +index 146c4f87..bcdad2bc 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { - {"PERLLIB", NULL}, - {"PERL5LIB", NULL}, - {"XCURSOR_PATH", NULL}, +@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { + {"GST_PTP_HELPER", NULL}, + {"GST_PTP_HELPER_1_0", NULL}, + {"GST_INSTALL_PLUGINS_HELPER", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix index cd8eb53846..f4eac39919 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; - enableParallelBuilding = true; + # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: + # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop + enableParallelBuilding = false; meta = with lib; { description = "A small, fast run-time speech synthesis engine"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index f6dfa96952..9f0585e0ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.14.00"; + version = "2022.02.21.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-tJuHzEi4nrj5jb6tmJeG21ggl4F+wvQyssEPNp/t6Ww="; + sha256 = "sha256-QCL+GLc6b4Ae3jUj7VCxnE7Yc1JJ8+P0/r41Zf0KYos="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix index e5797d332a..1fd088684c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-18p+ZaJgwCvjUchel4aaOjIr5jeVPKRNNhW1WljSezM="; + sha256 = "sha256-qByKmGp6LwuUWZ69eheF1yAX3qbXlqf0S2rGge53wuc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix index 6acb93c82b..df1b86fd1b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.34"; + version = "0.4.36"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo="; + sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index c4d961f4b7..90fe465826 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.9"; + version = "2.3.6"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; + sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 21b63875db..ed979c02c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection -, genericUpdater, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -55,10 +55,9 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 547c35e66e..c79f849d22 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -108,6 +108,8 @@ stdenv.mkDerivation rec { "-Dkeyring=false" "-Dhttp=false" "-Dgoogle=false" + ] ++ lib.optionals (avahi == null) [ + "-Ddnssd=false" ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 63692ca7de..a141d36e33 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.3"; + version = "21.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NVLGyUDUnOy3GYDtVyhGTvWOYoWp95EbkgTlFWuxE8="; + sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae..5eb6ceb204 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index d383a3093f..71a4437397 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.1.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iISG947MUWVVAxykFwB5UK5Z4uQnEWJ6AFr/ZlHx4Nw="; + sha256 = "sha256-Hcm48KTuBQbnVHd/T5XqQKbVS/XgJ4TYNbSCc8O53XQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix index ca0afe103b..1089c3ddf1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -1,19 +1,28 @@ -{ mkDerivation +{ lib +, mkDerivation , fetchFromGitLab , extra-cmake-modules }: mkDerivation rec { pname = "kquickimageeditor"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs="; + sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; }; nativeBuildInputs = [ extra-cmake-modules ]; + + meta = with lib; { + description = "Set of QtQuick components providing basic image editing capabilities"; + homepage = "https://invent.kde.org/libraries/kquickimageeditor"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix index c15de88f6a..0b378c583a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { --replace "-linkpkg" "-thread -linkpkg" ''; - nativeBuildInputs = [ autoreconfHook which ]; - buildInputs = [ ocaml bap findlib ctypes ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + buildInputs = [ bap ctypes ]; preInstall = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 0c9cd1a753..574d0b9d94 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-7gHqnhNog0CN92YyvypbHWWUnCDuvGP4oiJjtP9GkIY="; + sha256 = "sha256-ffeSrWcvxvMY4mmA/+VoMitoCVUUP91t1lIOcuzNrJY="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 8d506efef8..5b96928499 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.75.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-3oYQwV1Srnq8VfS+M+BwIznXRxQFXr78SwXO3Xu08ws="; + hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jti1aY8a9YB8x6fz7UqTY4uDj6gkMnG1hTN/Mgc+mHs="; + hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 809635c177..d2766c4d29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.2"; + version = "1.94.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FQwjJOgANSmJu9ev1K2oovNGovsbxnWMxNveTmH5fHg="; + sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix index 28235d65d9..c02c6116e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , intltool , meson @@ -37,6 +38,20 @@ stdenv.mkDerivation rec { sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; }; + patches = [ + # Fix undefined behavior + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch"; + sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk="; + }) + + # Fix building vapi + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; + sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; + }) + ]; + nativeBuildInputs = [ pkg-config intltool diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix index f85dbea54d..e0d3a7318a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { buildInputs = [ gcr - glib - libsoup - libxml2 openssl p11-kit uhttpmock ]; propagatedBuildInputs = [ + glib + libsoup + libxml2 gnome-online-accounts json-glib ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix index 46de584d5b..80c76ea980 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libktorrent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libktorrent/default.nix deleted file mode 100644 index 825fe87fe2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libktorrent/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, extra-cmake-modules -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -let - mainVersion = "5.1.2"; - -in stdenv.mkDerivation rec { - pname = "libktorrent"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - passthru = { - inherit mainVersion; - }; - - dontWrapQtApps = true; - - meta = with lib; { - description = "A BitTorrent library used by KTorrent"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index 8f59975a59..4ec392be30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -11,14 +11,13 @@ , file , gtk-doc , docbook-xsl-nons -, help2man , docbook_xml_dtd_412 , glib }: stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.13.0"; + version = "2.14.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hg/it3pHUnEYsmKcLzQKcZNthHZZwdXBjzTlOS1Losk="; + sha256 = "sha256-ccLk8O0UJwy7WZYr5Bq2XqaSFNe4i7HQehmVoB5C2Yg="; }; patches = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { ninja gtk-doc docbook-xsl-nons - help2man docbook_xml_dtd_412 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index c3852f2574..a1dd23357d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; + sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; homepage = "https://libosinfo.org/"; + changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix new file mode 100644 index 0000000000..9abe322412 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -0,0 +1,102 @@ +{ lib +, clang-tools +, llvmPackages +, boost17x +, protobuf +, python3Support ? false +, python3 +, log4cxxSupport ? false +, log4cxx +, snappySupport ? false +, snappy +, zlibSupport ? true +, zlib +, zstdSupport ? true +, zstd +, gtest +, gtestSupport ? false +, cmake +, curl +, fetchurl +, jsoncpp +, openssl +, pkg-config +, stdenv +}: + +let + /* + Check if null or false + Example: + let result = enableFeature null + => "OFF" + let result = enableFeature false + => "OFF" + let result = enableFeature «derivation» + => "ON" + */ + enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; + + # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails + clangTools = clang-tools.override { inherit stdenv llvmPackages; }; + # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper + boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + defaultOptionals = [ boost protobuf ] + ++ lib.optional python3Support python3 + ++ lib.optional snappySupport snappy.dev + ++ lib.optional zlibSupport zlib + ++ lib.optional zstdSupport zstd + ++ lib.optional log4cxxSupport log4cxx; + +in +stdenv.mkDerivation rec { + pname = "libpulsar"; + version = "2.9.1"; + + src = fetchurl { + hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + }; + + sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; + + # clang-tools needed for clang-format + nativeBuildInputs = [ cmake pkg-config clangTools ] + ++ defaultOptionals + ++ lib.optional gtestSupport gtest.dev; + + buildInputs = [ jsoncpp openssl curl ] + ++ defaultOptionals; + + # Needed for GCC on Linux + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + + cmakeFlags = [ + "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" + "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" + "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" + "-DClangTools_PATH=${clangTools}/bin" + ]; + + enableParallelBuilding = true; + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + #include + int main (int argc, char **argv) { + pulsar::Client client("pulsar://localhost:6650"); + return 0; + } + ''} > test.cc + $CXX test.cc -L $out/lib -I $out/include -lpulsar -o test + ''; + + meta = with lib; { + homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + description = "Apache Pulsar C++ library"; + + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.corbanr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index a0b959d178..2a5b75a7b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-06-23"; + version = "unstable-2021-10-25"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "97bc8180ad682b004ea224d1db7b8e108eda4397"; - sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5"; + rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b"; + sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix index 0c885f0764..ce2df9cc9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix @@ -4,7 +4,11 @@ , pkg-config , glib , libsoup +, libxml2 , gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 , gnome }: @@ -12,6 +16,8 @@ stdenv.mkDerivation rec { pname = "rest"; version = "0.8.1"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; @@ -20,14 +26,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 ]; - buildInputs = [ + propagatedBuildInputs = [ glib libsoup + libxml2 ]; configureFlags = [ + "--enable-gtk-doc" # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix index 0acca9ae24..691975b1af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "librsb"; - version = "1.2.0.9"; + version = "1.2.0.10"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g="; }; # The default configure flags are still present when building diff --git a/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix index 7b48f150c9..8b61669d1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , perl , boost , rdkafka @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { makeFlags = [ "GEN_PKG_CONFIG=y" ]; + patches = [ + # Fix compatibility with Avro master branch + (fetchpatch { + url = "https://github.com/confluentinc/libserdes/commit/d7a355e712ab63ec77f6722fb5a9e8056e7416a2.patch"; + sha256 = "14bdx075n4lxah63kp7phld9xqlz3pzs03yf3wbq4nmkgwac10dh"; + }) + ]; + postPatch = '' patchShebangs configure lds-gen.pl ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index 9222981120..f6a796f256 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.0.7"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM="; + sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index d4583c74df..c9f6e11d41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.7"; + version = "2.10.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; + sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix index bcd1573e20..077055cbb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: stdenv.mkDerivation rec { - name = "libsmartcols"; - version = "v2.36.1"; + pname = "libsmartcols"; + version = "2.36.1"; nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; src = fetchFromGitHub { owner = "karelzak"; repo = "util-linux"; - rev = version; + rev = "v${version}"; sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsnark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsnark/default.nix index c3e6d0e049..37352bf5e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsnark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsnark/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: -let - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; -in stdenv.mkDerivation rec { - name = "libsnark-pre${version}"; - version = lib.substring 0 8 rev; +stdenv.mkDerivation rec { + pname = "libsnark"; + version = "unstable-2018-01-15"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -12,7 +10,7 @@ in stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; src = fetchFromGitHub { - inherit rev; + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; owner = "scipr-lab"; repo = "libsnark"; sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix index 6ec8f24b71..c48c71e144 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Implementation of the Sender Policy Framework for SMTP authorization"; - homepage = "https://www.libspf2.org"; + description = "Implementation of the Sender Policy Framework for SMTP " + + "authorization (Helsinki Systems fork)"; + homepage = "https://github.com/helsinki-systems/libspf2"; license = with licenses; [ lgpl21Plus bsd2 ]; maintainers = with maintainers; [ pacien ajs124 das_j ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix index 9c8e418fba..25214242b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtsm"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "Aetf"; repo = "libtsm"; rev = "v${version}"; - sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"; + sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto="; }; buildInputs = [ libxkbcommon ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix index 7002f75cc4..14fb004187 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libui/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - shortName = "libui"; - version = "4.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation { - name = "${shortName}-${version}"; +stdenv.mkDerivation rec { + pname = "libui"; + version = "4.1a"; src = fetchFromGitHub { owner = "andlabs"; repo = "libui"; @@ -27,22 +26,22 @@ stdenv.mkDerivation { mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig '' + lib.optionalString stdenv.isLinux '' - mv ./out/${shortName}.so.0 $out/lib/ - ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so + mv ./out/libui.so.0 $out/lib/ + ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' - mv ./out/${shortName}.A.dylib $out/lib/ - ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + mv ./out/libui.A.dylib $out/lib/ + ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include - cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc - substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ + cp ${./libui.pc} $out/lib/pkgconfig/libui.pc + substituteInPlace $out/lib/pkgconfig/libui.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix new file mode 100644 index 0000000000..d9446d8c85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib, cmake, expat }: + +stdenv.mkDerivation rec { + pname = "libwbxml"; + version = "0.11.7"; + + src = fetchFromGitHub { + owner = "libwbxml"; + repo = "libwbxml"; + rev = "${pname}-${version}"; + sha256 = "sha256:1b81rbkd28d9059vh8n5gql73crp8h7av67kkmr6lhicl08fv2xx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat ]; + + postPatch = '' + sed -i 's/^SET.*$//' cmake/CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/libwbxml/libwbxml"; + description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + maintainers = with maintainers; [ mh ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix index c78cc192a7..9f92ed5fd4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; + sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index b476edaf5e..85fda8ddc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , docbook_xml_dtd_43 , docbook_xsl @@ -11,11 +12,12 @@ , python3 , shared-mime-info , nixosTests +, xz }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.1"; + version = "0.3.7"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; + sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; }; patches = [ @@ -38,12 +40,13 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + python3 shared-mime-info ]; buildInputs = [ glib + xz ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 4207e9a91d..0e74d131b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 38486c9..c567613 100644 +index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ +@@ -110,8 +110,8 @@ else prefix = get_option('prefix') datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) @@ -14,11 +14,11 @@ index 38486c9..c567613 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') diff --git a/meson_options.txt b/meson_options.txt -index 27e8cb6..74548ae 100644 +index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,3 +2,4 @@ - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') +@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') + option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix index 6a07371261..d6efe0543d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -10,8 +10,7 @@ , pcre2 # update script -, genericUpdater -, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -40,9 +39,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE:String=Release" ]; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index 2e5ec92cf4..1c1b57f39c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.01.21"; + version = "2022.02.07"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-diV5wULbOrqMRDCyI9NjVaR6JUbYl9KWHUlvA/jjqQ4="; + sha256 = "sha256-bwwfinHOtQa8v5abArSww2l7ThXa623LqYcsh0XOksY="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index b91e140345..1fb573931b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -252,12 +252,14 @@ self = stdenv.mkDerivation { inherit (libglvnd) driverLink; inherit llvmPackages; - tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { - name = "mesa-dev-does-not-depend-on-llvm"; - buildCommand = '' - echo ${self.dev} >>$out - ''; - disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + tests = lib.optionalAttrs stdenv.isLinux { + devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${self.dev} >>$out + ''; + disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + }; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 1e9e44e099..22d4567c56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja +, fetchpatch , secureBuild ? false }: @@ -7,14 +8,28 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0="; + sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA="; }; + patches = [ + (fetchpatch { + name = "older-macos-fixes.patch"; + url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; + sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c"; + }) + ]; + + doCheck = true; + preCheck = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" + ''; nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ]; @@ -25,10 +40,9 @@ stdenv.mkDerivation rec { in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib - mv $out/include $dev/include - mv $out/cmake $dev/lib/ + mv $out/lib/cmake $dev/lib/ - find $out/lib + find $dev $out -type f '' + (lib.optionalString secureBuild '' # pretend we're normal mimalloc ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} @@ -44,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ kamadorueda thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix index 9bf5235db8..075f096486 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; + sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index b73289ca82..d3bcaa2658 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, genericUpdater, common-updater-scripts, libebur128 +, gtk2, gitUpdater, libebur128 , jack2, ladspa-sdk, swig, which, ncurses , enablePython ? false, python3 }: @@ -51,9 +51,8 @@ stdenv.mkDerivation rec { sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; 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 948de303ce..5c58aa4f8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -18,8 +18,7 @@ , vid-stab , opencv3 , ladspa-sdk -, genericUpdater -, common-updater-scripts +, gitUpdater , ladspaPlugins , mkDerivation , which @@ -70,9 +69,8 @@ mkDerivation rec { inherit ffmpeg; }; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index 570a123f86..bff44d8aaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z"; + sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 4e5eed1e43..9228550174 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g="; + sha256 = "sha256-TsGoSVewQJlr0zj8qYEd+UU8DlncZDCqfrqTv89LEYU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix new file mode 100644 index 0000000000..64f362e352 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/nanodbc/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }: + +stdenv.mkDerivation rec { + pname = "nanodbc"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "nanodbc"; + repo = "nanodbc"; + rev = "v${version}"; + sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ unixODBC ]; + + cmakeFlags = if (stdenv.hostPlatform.isStatic) then + [ "-DBUILD_STATIC_LIBS=ON" ] + else + [ "-DBUILD_SHARED_LIBS=ON" ]; + + # fix compilation on macOS + # https://github.com/nanodbc/nanodbc/issues/274 + # remove after the next version update + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot/VERSION $sourceRoot/VERSION.txt + substituteInPlace $sourceRoot/CMakeLists.txt \ + --replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt' + '' else ""; + + meta = with lib; { + homepage = "https://github.com/nanodbc/nanodbc"; + changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md"; + description = "Small C++ wrapper for the native C ODBC API"; + license = licenses.mit; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix index d53e0d9b42..8c0f213b82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20211208"; + version = "20220216"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "1c9axrnafksnks7v5fmi6nzs0qim9n6j5kh5d0vfl3b4r22irhqr"; + sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix index 7110977572..27af3be4f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { - pname = "netcdf"; + pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.8.0"; # Remove patch mentioned below on upgrade src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix index 385f2d84f8..e42ee750cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix index ea216335b7..279c8a0fd0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" ]; + postFixup = '' + substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \ + 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "' + ''; + meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix index f4a9b67e94..d23401c0fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-DGAE3XomAoRhAkKUCxmr8R0dhNXeusSgETzmsbV1RhQ="; + sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix index e9b0b95d1a..c8981c54c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k="; + sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix index baae8ae81b..6392383c98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index f1bbb01653..8d02b976c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.2"; + version = "1.4.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-+7o7b64ORCLn8z0KbnUKhlgPs9mlyDCUiNKJEbusGxw="; + sha256 = "sha256-i73w/Vkr5TPLB1ulPbPU4OVGwdNlky1brfarueD7akE="; }; nativeBuildInputs = [ cmake python3 ispc ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix index abef3d6cd1..dfb70ab624 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pagmo2/default.nix @@ -5,21 +5,22 @@ , nlopt , ipopt , boost +, tbb }: stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.9"; + version = "2.18.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; + sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt ipopt boost ]; + buildInputs = [ eigen nlopt ipopt boost tbb ]; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix index 2dfd354668..c45a8e03fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "PDF to XML converter"; + homepage = "https://sourceforge.net/projects/pdf2xml/"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 8ff0f3bb49..42923d4f02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U="; + sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c="; }; buildInputs = [ @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://phonon.kde.org/"; + homepage = "https://community.kde.org/Phonon"; + # Dev repo is at https://invent.kde.org/libraries/phonon-vlc description = "GStreamer backend for Phonon"; platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl2Plus ]; + license = with licenses; [ bsd3 lgpl21Plus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index d87c9d68b7..9f1b396e47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.046"; + version = "1.048"; src = fetchurl { - url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-cgavrH/rIHXZn7sDa7NRPTKy2sOvMDQQJjmGNUeT7s8="; + url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; + sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE="; }; buildInputs = [ fastjet ]; @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; - license = licenses.gpl2; + changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index e9b7f54e2a..80de299793 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, geant_version }: let - mkDataset = { name, version, sha256, envvar }: + mkDataset = { pname, version, sha256, envvar }: stdenv.mkDerivation { - inherit name version; + inherit pname version; inherit geant_version; src = fetchurl { - url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; + url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; inherit sha256; }; @@ -15,7 +15,7 @@ let dontBuild = true; dontConfigure = true; - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}"; + datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; installPhase = '' mkdir -p $datadir mv ./* $datadir @@ -32,86 +32,86 @@ let }; }; in - builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [ + builtins.listToAttrs (map (a: { inherit (a) pname; value = mkDataset a; }) [ { - name = "G4NDL"; + pname = "G4NDL"; version = "4.6"; sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; envvar = "NEUTRONHP"; } { - name = "G4EMLOW"; + pname = "G4EMLOW"; version = "8.0"; sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; envvar = "LE"; } { - name = "G4PhotonEvaporation"; + pname = "G4PhotonEvaporation"; version = "5.7"; sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U="; envvar = "LEVELGAMMA"; } { - name = "G4RadioactiveDecay"; + pname = "G4RadioactiveDecay"; version = "5.6"; sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE="; envvar = "RADIOACTIVE"; } { - name = "G4SAIDDATA"; + pname = "G4SAIDDATA"; version = "2.0"; sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE="; envvar = "SAIDXS"; } { - name = "G4PARTICLEXS"; + pname = "G4PARTICLEXS"; version = "4.0"; sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU="; envvar = "PARTICLEXS"; } { - name = "G4ABLA"; + pname = "G4ABLA"; version = "3.1"; sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; envvar = "ABLA"; } { - name = "G4INCL"; + pname = "G4INCL"; version = "1.0"; sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; envvar = "INCL"; } { - name = "G4PII"; + pname = "G4PII"; version = "1.3"; sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY="; envvar = "PII"; } { - name = "G4ENSDFSTATE"; + pname = "G4ENSDFSTATE"; version = "2.3"; sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM="; envvar = "ENSDFSTATE"; } { - name = "G4RealSurface"; + pname = "G4RealSurface"; version = "2.2"; sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA="; envvar = "REALSURFACE"; } { - name = "G4TENDL"; + pname = "G4TENDL"; version = "1.4"; sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA="; envvar = "PARTICLEHP"; 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 629066d23a..c3171c589e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-4Ij8z9GmwvjhCJ9FcQG+4eXHqXd+nVHGQZyKKIpJ4bs="; + sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 03b298908b..d33beb6659 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.306"; + version = "8.307"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-c0gDtyKxwbU8jPLw08MHR8gPwt3l4LoUG8k5fa03qPY="; + sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0="; }; nativeBuildInputs = [ rsync ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 926de30625..b2bcb421be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,23 +1,23 @@ diff --git a/meson.build b/meson.build -index d4a4cda7..a27569bd 100644 +index 2107c19ec..20ccdfd9f 100644 --- a/meson.build +++ b/meson.build -@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' - - alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) +@@ -380,8 +380,8 @@ lilv_lib = dependency('lilv-0', required: get_option('lv2')) + summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true) + cdata.set('HAVE_LILV', lilv_lib.found()) -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name - installed_tests_enabled = not get_option('installed_tests').disabled() + installed_tests_enabled = get_option('installed_tests').allowed() installed_tests_template = files('template.test.in') diff --git a/meson_options.txt b/meson_options.txt -index 1b915ac3..85beb86a 100644 +index 961ae2a76..a36e9e45f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -29,6 +29,9 @@ option('installed_tests', +@@ -22,6 +22,9 @@ option('installed_tests', description: 'Install manual and automated test executables', type: 'feature', value: 'disabled') diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 79682d7ace..d4dc430213 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -69,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.45"; + version = "0.3.48"; outputs = [ "out" @@ -87,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-OnQd98qfOekAsVXLbciZLNPrM84KBX6fOx/f8y2BYI0="; + sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk="; }; patches = [ @@ -139,7 +139,7 @@ let ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit - ++ lib.optionals x11Support [ libcanberra xorg.libxcb ]; + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -214,6 +214,7 @@ let "nix-support/client-rt.conf.json" "nix-support/client.conf.json" "nix-support/jack.conf.json" + "nix-support/minimal.conf.json" "nix-support/pipewire.conf.json" "nix-support/pipewire-pulse.conf.json" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 9ab197278d..4f738c33a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation rec { "-Delogind=disabled" "-Ddoc=${mesonEnableFeature enableDocs}" "-Dintrospection=${mesonEnableFeature enableGI}" + "-Dsystemd-system-service=true" + "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" + "-Dsysconfdir=/etc" ]; passthru.updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix index 43699291d3..f661ac0e40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/portmidi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "portmidi"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "zOmzJ2MLGhGXiN0XjcmnnUrk/uqxP9IaZbqCG5XchC4="; + sha256 = "sha256-bLGqi3b9FHBA43baNDT8jkPBQSXAUDfurQSJHLcy3AE="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/prison/default.nix b/third_party/nixpkgs/pkgs/development/libraries/prison/default.nix index 4275622c24..71f8596c64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/prison/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/prison/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: -let v = "1.0"; in - stdenv.mkDerivation rec { - name = "prison-${v}"; + pname = "prison"; + version = "1.0"; src = fetchurl { - url = "mirror://kde/stable/prison/${v}/src/${name}.tar.gz"; + url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz"; sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix index 93e415f626..8251a17a83 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "proj-datumgrid"; + pname = "proj-datumgrid"; version = "world-1.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 6a8baae5c9..c976db8822 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.12"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ="; + sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix index 709a3fb153..e838eb0720 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix @@ -1,15 +1,11 @@ {lib, stdenv, fetchurl, cmake, qt4}: -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; +stdenv.mkDerivation rec { + pname = "qimageblitz"; + version = "0.0.4"; src = fetchurl { - url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; @@ -21,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; license = lib.licenses.bsd2; - homepage = "http://${pn}.sourceforge.net"; + homepage = "http://qimageblitz.sourceforge.net"; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 96d2abe5a6..e581bdf5f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -15,22 +15,17 @@ , libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx }: -let - v_maj = "4.8"; - v_min = "7"; - vers = "${v_maj}.${v_min}"; -in - # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies stdenv.mkDerivation rec { - name = "qt-${vers}"; + pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full"; + version = "4.8.7"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" - + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz"; + + "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz"; sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; @@ -40,8 +35,6 @@ stdenv.mkDerivation rec { setOutputFlags = false; - # The version property must be kept because it will be included into the QtSDK package name - version = vers; prePatch = '' substituteInPlace configure --replace /bin/pwd pwd @@ -131,13 +124,13 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" configureFlags+=" - -docdir $out/share/doc/${name} + -docdir $out/share/doc/qt-${version} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $TMPDIR/share/doc/${name}/examples - -demosdir $TMPDIR/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations + -examplesdir $TMPDIR/share/doc/qt-${version}/examples + -demosdir $TMPDIR/share/doc/qt-${version}/demos + -datadir $out/share/qt-${version} + -translationdir $out/share/qt-${version}/translations --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 72413b372f..f2ea86160f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,36 +2,40 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.20.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "sha256-aIhLrGKb8iPl8N483+EOaCrTua96Qvl2lc2UXRiqvJA="; + hash = "sha256-Faex1NF5bJa0GdC+Sz4p6kHaGUtAkqZlNGi0TSc5ckw="; }; nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + sourceRoot = "source/Kvantum"; buildPhase = '' + runHook preBuild qmake kvantum.pro make + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir $TMP/kvantum make INSTALL_ROOT="$TMP/kvantum" install mv $TMP/kvantum/usr/ $out mv $TMP/kvantum/${qt4}/lib $out + runHook postInstall ''; meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rang/default.nix index 79ab52fc83..050beef5ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix index 7fc8fe98db..1e70d6e0db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rubberband/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; + makeFlags = [ "AR:=$(AR)" ]; meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index 8a9df7601d..d93b4fb2a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7SIbj1L0gS+BDuvgzFbNg1WlydIcYtFCrAWtDaFHk18="; + sha256 = "sha256-Gp9JkRUDoi9WgXzILqm4f7fnRntf+YnKWqYcEufVMtk="; }; # perl is only used during the check phase. diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix new file mode 100644 index 0000000000..9526a62501 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, pkg-config +, blas +, bzip2 +, cbc +, clp +, ipopt +, lapack +, libamplsolver +, zlib +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "bonmin"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Bonmin"; + rev = "releases/${version}"; + sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + }; + + nativeBuildInputs = [ + gfortran + pkg-config + ]; + buildInputs = [ + blas + bzip2 + cbc + clp + ipopt + lapack + libamplsolver + zlib + ]; + + meta = with lib; { + description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + homepage = "https://github.com/coin-or/Bonmin"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix index 3905e70d34..fe9fc54090 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix @@ -3,7 +3,6 @@ with lib; let - version = "1.3.0"; incfile = builtins.toFile "make.inc.custom" '' CC = g++ FORT = gfortran @@ -32,10 +31,11 @@ let INC = -I$(clBLAS)/include #-I$(AMDAPP)/include ''; -in stdenv.mkDerivation { - name = "clmagma-${version}"; +in stdenv.mkDerivation rec { + pname = "clmagma"; + version = "1.3.0"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; name = "clmagma-${version}.tar.gz"; }; @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = "http://icl.cs.utk.edu/magma/index.html"; + homepage = "https://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; 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 e0dfef0b7e..325a6b82a6 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 @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, blas +, lapack +, gfortran +, enableAMPL ? stdenv.isLinux, libamplsolver +}: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.12.13"; + version = "3.14.5"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Ipopt"; + rev = "releases/${version}"; + sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lblas" - "--with-lapack-lib=-llapack" + "--with-asl-cflags=-I${libamplsolver}/include" + "--with-asl-lflags=-lamplsolver" ]; - nativeBuildInputs = [ unzip gfortran ]; - - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ pkg-config gfortran ]; + buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix new file mode 100644 index 0000000000..bcbde5f613 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "libamplsolver"; + version = "20211109"; + + src = fetchurl { + url = "https://ampl.com/netlib/ampl/solvers.tgz"; + sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; + }; + + patches = [ + # Debian provides a patch to build a shared library + (fetchpatch { + url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; + sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; + }) + ]; + + installPhase = '' + runHook preInstall + pushd sys.`uname -m`.`uname -s` + install -D -m 0644 *.h -t $out/include + install -D -m 0644 *.so* -t $out/lib + install -D -m 0644 *.a -t $out/lib + popd + runHook postInstall + ''; + + meta = with lib; { + description = "A library of routines that help solvers work with AMPL"; + homepage = "https://ampl.com/netlib/ampl/"; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix index cd9f06499d..d0f09290c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "1.02r5"; + version = "1.02r6"; pname = "libhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libhomfly"; rev = version; - sha256 = "1szv8iwlhvmy3saigi15xz8vgch92p2lbsm6440v5s8vxj455bvd"; + sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index ca3e4a2436..20978e31cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; - enableParallelBuilding = true; + # protobuf generation is not thread safe + enableParallelBuilding = false; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 31b1af5abe..3eb0fa66df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -67,6 +67,11 @@ stdenv.mkDerivation rec { configureScript = "python ./configure"; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/158730 + # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -74,6 +79,6 @@ stdenv.mkDerivation rec { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://www.mcs.anl.gov/petsc/index.html"; license = licenses.bsd2; - maintainers = with maintainers; [ wucke13 cburstedde ]; + maintainers = with maintainers; [ cburstedde ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix index a945e99ec9..6ccbfb11f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "sha256-yoh25DmvY7fohAvABCiSLkvr7TskGd0ED2K3rIa/IeM="; + sha256 = "sha256-ewn7AGNqTXY3bp5itHTfAQ2Es2ZAIbuRFM5U600Px50="; }; # Actually link and add libgfortran to the rpath diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 4c0059184e..bf5251d1ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.1.4"; + version = "6.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-pjb4Q9b+5hcI0ZYoez46V/ve4+1GJORu2ZGweceaWDY="; + sha256 = "sha256-uSPE7uFiG4xbsAeo/UmOP5Ns+3yZ7kKL2bNxzd8mzP8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ebac6ac44..e734ed8ff3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -3,14 +3,12 @@ }: let - version = "4.4.4"; - name = "suitesparse-${version}"; - int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + version = "4.4.4"; + pname = "suitesparse"; src = fetchurl { url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; @@ -71,7 +69,7 @@ stdenv.mkDerivation { done # Install documentation - outdoc=$out/share/doc/${name} + outdoc=$out/share/doc/suitesparse-${version} mkdir -p $outdoc cp -r AMD/Doc $outdoc/amd cp -r BTF/Doc $outdoc/bft diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix index 19d2119622..1939b0a530 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix @@ -59,7 +59,9 @@ let in stdenv.mkDerivation rec { pname = "trilinos"; - version = "12.12.1"; # Xyce 7.4 requires version 12.12.1 + # Xyce 7.4 requires version 12.12.1 + # nixpkgs-update: no auto update + version = "12.12.1"; src = fetchFromGitHub { owner = "trilinos"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix index dcec1c897b..39a64c84dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "soil"; + pname = "soil"; + version = "unstable-2020-01-04"; src = fetchzip { url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soprano/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soprano/default.nix deleted file mode 100644 index 46520714c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/soprano/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkg-config }: - -stdenv.mkDerivation rec { - pname = "soprano"; - version = "2.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2"; - sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; - }; - - patches = [ ./find-virtuoso.patch ]; - - # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = { - homepage = "http://soprano.sourceforge.net/"; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with lib.maintainers; [ sander ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch b/third_party/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch deleted file mode 100644 index 95a2c7e965..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Yury G. Kudryashov -Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH - ---- - backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++--------- - backends/virtuoso/virtuosobackend.h | 2 +- - 2 files changed, 23 insertions(+), 10 deletions(-) - -diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp -index c245101..249958a 100644 ---- a/backends/virtuoso/virtuosobackend.cpp -+++ b/backends/virtuoso/virtuosobackend.cpp -@@ -28,6 +28,7 @@ - #include "odbcconnectionpool.h" - - #include "sopranodirs.h" -+#include "soprano-config.h" - - #include - #include -@@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c - - bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - { --#ifndef Q_OS_WIN -- if ( findVirtuosoDriver().isEmpty() ) { -- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -- return false; -- } --#endif -- - QString virtuosoBin = locateVirtuosoBinary(); - if ( virtuosoBin.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; - return false; - } - -+#ifndef Q_OS_WIN -+ if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) { -+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -+ return false; -+ } -+#endif -+ - QString vs = determineVirtuosoVersion( virtuosoBin ); - if ( vs.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; -@@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary() - - #ifndef Q_OS_WIN - // static --QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() -+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) - { -- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); -+ QString virtuosoBin; -+ if (virtuosoBinHint.isEmpty()) -+ virtuosoBin = locateVirtuosoBinary(); -+ else -+ virtuosoBin = virtuosoBinHint; -+ -+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); -+ return Soprano::findLibraryPath( "virtodbc_r", -+ QStringList() -+ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX) -+ << virtuosoBinDir.absoluteFilePath("../lib"), -+ QStringList() << QLatin1String( "virtuoso/plugins/" ) << -+ QLatin1String( "odbc/" ) ); - } - #endif - -diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h -index 646b9f8..535fbb9 100644 ---- a/backends/virtuoso/virtuosobackend.h -+++ b/backends/virtuoso/virtuosobackend.h -@@ -52,7 +52,7 @@ namespace Soprano { - - #ifndef Q_OS_WIN - private: -- static QString findVirtuosoDriver(); -+ static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()); - #endif - }; - } --- -tg: (2321148..) t/find-virtuoso (depends on: master) diff --git a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix index 8706b87892..c69345193c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { - name = "speech_tools-${version}.0"; - version = "2.5"; + pname = "speech_tools"; + version = "2.5.0"; src = fetchurl { - url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz"; + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index 16cf654914..db5db61c6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -124,6 +124,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dusb-acl-helper-dir=${placeholder "out"}/bin" "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" + ] ++ lib.optionals (!withPolkit) [ + "-Dpolkit=disabled" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 6704d894f5..5fdf6c11d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + pname = "sqlite${optionalString interactive "-interactive"}"; version = "3.37.2"; # nixpkgs-update: no auto update diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix index a8cf2a44fa..3c814e1720 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix @@ -1,18 +1,19 @@ { lib, fetchurl, tcl }: tcl.mkTclDerivation rec { - name = "tclx-${version}.${patch}"; - version = "8.4"; - patch = "1"; + pname = "tclx"; + version = "8.4.1"; src = fetchurl { - url = "mirror://sourceforge/tclx/tclx${version}.${patch}.tar.bz2"; + url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2"; sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; # required in order for tclx to properly detect tclx.tcl at runtime - postInstall = '' - ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version} + postInstall = let + majorMinorVersion = lib.versions.majorMinor version; + in '' + ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index c5795df55c..f85e56578b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs="; + sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; }; # Workaround to make the python wrapper not drop this package: diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index b00177960d..286f5ccc3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.6"; + version = "0.17.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-X60zN3orHU8lOfRVCfbHTdrleKxB7ILCIGvXSZLdoSk="; + sha256 = "sha256-BdZCoW3QHM4Oue4bpuSFsuwIU1vsZ5pjqVv9TfGNC7U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix index 48a80aacdf..980d073f12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uri/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { - name = "uri-${version}"; + pname = "uri"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix index 55ef86c88a..dfb76069c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/2.90.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; + pname = "vte"; + version = "0.36.3"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix index c180b05e95..d770bd54d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -90,6 +90,16 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + preFixup = '' + for lib in $out/lib/libvtk*.so; do + ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" + done + + mv $out/include/vtk-${majorVersion}/* $out/include + rmdir $out/include/vtk-${majorVersion} + ln -s $out/include $out/include/vtk-${majorVersion} + ''; + meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index b5a16df21a..92405b35de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , runCommand , fetchurl , perl @@ -44,7 +45,6 @@ , lcms2 , libmanette , openjpeg -, enableGeoLocation ? true , geoclue2 , sqlite , enableGLES ? true @@ -58,10 +58,10 @@ , substituteAll , glib , addOpenGLRunpath +, enableGeoLocation ? true +, withLibsecret ? true }: -assert enableGeoLocation -> geoclue2 != null; - stdenv.mkDerivation rec { pname = "webkitgtk"; version = "2.34.6"; @@ -125,12 +125,8 @@ stdenv.mkDerivation rec { libidn libintl lcms2 - ] ++ lib.optionals stdenv.isLinux [ - libmanette - ] ++ [ libnotify libpthreadstubs - libsecret libtasn1 libwebp libxkbcommon @@ -155,28 +151,36 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" {} '' + runCommand "${pname}_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp + libmanette systemd wayland xdg-dbus-proxy - ] ++ lib.optional enableGeoLocation geoclue2; + ] ++ lib.optionals enableGeoLocation [ + geoclue2 + ] ++ lib.optionals withLibsecret [ + libsecret + ]; propagatedBuildInputs = [ gtk3 libsoup ]; - cmakeFlags = [ + cmakeFlags = let + cmakeBool = x: if x then "ON" else "OFF"; + in [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" + "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" @@ -191,7 +195,9 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_MALLOC=ON" ] ++ lib.optionals (!stdenv.isLinux) [ "-DUSE_SYSTEMD=OFF" - ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ + "-DENABLE_GLES2=ON" + ]; postPatch = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 4cfd2548b5..2fc57b87ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw="; + sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index bc8fc6f5b0..19a57d68e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 46ef04dcb7..34d76e53ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -14,14 +14,15 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime +, setfile }: assert withMesa -> libGLU != null && libGL != null; -let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; -in stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.9.5"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ @@ -115,7 +116,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.darwin ++ platforms.linux; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index 0469ccbd0d..628d8bd023 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -17,14 +17,17 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit +, setfile }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in @@ -66,7 +69,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; configureFlags = [ @@ -126,7 +129,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch rename to third_party/nixpkgs/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 08d695c15e..c54cdeca6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -16,28 +15,15 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; + sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk="; }; - patches = [ - # Fix broken translation. - # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; - sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; - }) - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; - sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -54,13 +40,18 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; - configureFlags = lib.optionals buildPortalsInGnome [ + configureFlags = if buildPortalsInGnome then [ "--enable-wallpaper" "--enable-screenshot" "--enable-screencast" "--enable-background" "--enable-settings" "--enable-appchooser" + ] else [ + # These are now enabled by default, even though we do not need them for GNOME. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355 + "--disable-settings" + "--disable-appchooser" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index bb8950ca1e..19a671e7e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib +{ lib +, acl +, autoreconfHook +, dbus , fetchFromGitHub , fetchpatch -, nixosTests -, substituteAll -, autoreconfHook -, pkg-config -, libxml2 -, glib -, pipewire , flatpak -, gsettings-desktop-schemas -, acl -, dbus , fuse -, libportal , geoclue2 +, glib +, gsettings-desktop-schemas , json-glib +, libportal +, libxml2 +, nixosTests +, pipewire +, pkg-config +, stdenv +, substituteAll , wrapGAppsHook +, enableGeoLocation ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.10.1"; + version = "1.12.1"; outputs = [ "out" "installedTests" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; + sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; }; patches = [ @@ -39,36 +40,33 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit flatpak; }) - # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636 - # Remove it when the next stable release arrives - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch"; - sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs="; - }) ]; nativeBuildInputs = [ autoreconfHook - pkg-config libxml2 + pkg-config wrapGAppsHook ]; buildInputs = [ - glib - pipewire - flatpak acl dbus - geoclue2 + flatpak fuse - libportal + glib gsettings-desktop-schemas json-glib + libportal + pipewire + ] ++ lib.optionals enableGeoLocation [ + geoclue2 ]; configureFlags = [ "--enable-installed-tests" + ] ++ lib.optionals (!enableGeoLocation) [ + "--disable-geoclue" ]; makeFlags = [ @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop integration portals for sandboxed apps"; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix new file mode 100644 index 0000000000..f5425cf549 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "mmap"; + version = "20201220-git"; + + description = "Portable mmap (file memory mapping) utility library."; + + deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; + sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; + }; + + packageName = "mmap"; + + asdFilesToKeep = ["mmap.asd"]; + overrides = x: x; +} +/* (SYSTEM mmap DESCRIPTION + Portable mmap (file memory mapping) utility library. SHA256 + 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL + http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 + e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (alexandria babel cffi documentation-utils trivial-features trivial-indent) + VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix new file mode 100644 index 0000000000..02b641043e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "slynk"; + version = "sly-20210411-git"; + + parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; + sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; + }; + + packageName = "slynk"; + + asdFilesToKeep = ["slynk.asd"]; + overrides = x: x; +} +/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 + 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL + http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 + 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL + DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES + (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl + slynk/package-fu slynk/profiler slynk/retro slynk/stickers + slynk/trace-dialog)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 4eb9be0b97..d723903c0e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -178,6 +178,7 @@ mgl-pax minheap misc-extensions mk-string-metrics +mmap moptilities more-conditions mt19937 @@ -207,6 +208,7 @@ salza2 serapeum simple-date simple-date-time +slynk smart-buffer smug spinneret diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 60338d0ea0..a43351b1af 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -2338,6 +2338,14 @@ let quicklisp-to-nix-packages = rec { })); + "slynk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."slynk" or (x: {})) + (import ./quicklisp-to-nix-output/slynk.nix { + inherit fetchurl; + })); + + "simple-date-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date-time" or (x: {})) @@ -2702,6 +2710,20 @@ let quicklisp-to-nix-packages = rec { })); + "mmap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mmap" or (x: {})) + (import ./quicklisp-to-nix-output/mmap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index a0f76135fd..5d8064bac2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -200,7 +200,7 @@ let }; manta = super.manta.override { - nativeBuildInputs = with pkgs; [ nodejs-12_x installShellFiles ]; + nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; postInstall = '' # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 completion_cmds=$(find ./bin -type f -printf "%f\n") @@ -314,6 +314,13 @@ let ''; }; + parcel = super.parcel.override { + buildInputs = [ self.node-gyp-build ]; + preRebuild = '' + sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + ''; + }; + postcss-cli = super.postcss-cli.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -336,7 +343,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g=="; + sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index cf0e9fc183..e5fe5bf356 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -164,7 +164,7 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -198,7 +198,7 @@ , "markdownlint-cli" , "markdownlint-cli2" , "markdown-link-check" -, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"} +, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" @@ -224,6 +224,7 @@ , "nrm" , "ocaml-language-server" , "parcel-bundler" +, "parcel" , "parsoid" , "patch-package" , "peerflix" @@ -257,7 +258,7 @@ , "reveal-md" , "rimraf" , "rollup" -, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } +, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-analyzer/build-deps" } , "rtlcss" , "s3http" , "sass" @@ -361,7 +362,7 @@ , "vscode-json-languageserver" , "vscode-json-languageserver-bin" , "vscode-langservers-extracted" -, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } +, { "vscode-lldb-build-deps": "../../applications/editors/vscode/extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "wavedrom-cli" 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 e2be2faab6..eff68036b2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -94,22 +94,13 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@angular-devkit/architect-0.1302.4" = { + "@angular-devkit/architect-0.1302.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1302.4"; + version = "0.1302.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.4.tgz"; - sha512 = "9dS0Gvs4ER1DPSnKorJ4uk27A/rWwyvNy5CheOZu4ZTUnggGA7SFtMG7CKPD11Ae01lIMfxKfDqJYE8j2VpQaw=="; - }; - }; - "@angular-devkit/core-13.2.2" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "13.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.2.tgz"; - sha512 = "qH0Vu8qwGD5uhmE8PtePA1lm7xL3JtbBCcrQICmLqD6njLDVb2N5pbdDXeiXDlWGUoIRHUhu6Uw4AsY8zXP/FA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.5.tgz"; + sha512 = "r07oo8GgUGY28SR3PCM1qNfLE6PNx6SfzBlG4p0OrQQ68ln8HipsEysDGakOWjNFK18SCGWOXAUNrUj8GnV+5g=="; }; }; "@angular-devkit/core-13.2.3" = { @@ -130,13 +121,13 @@ let sha512 = "hSw1JWA/6dDAF/xleQRXGtzHphfU49TMUhvAoAmsmmz3NAn03xLy1dtqdIXIf+TkFXVvZDaAB2mW8KfRV67GFg=="; }; }; - "@angular-devkit/schematics-13.2.2" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "13.2.2"; + "@angular-devkit/core-13.2.5" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.2.tgz"; - sha512 = "kXPLTkSzRCeBX+SYUkC6MIrWCkH90Y8hVegR9R5n2YqhCJyE+dZlcx4d/8d3VHtZlzAs0LL8BU+liC3wMIagjA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.5.tgz"; + sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A=="; }; }; "@angular-devkit/schematics-13.2.3" = { @@ -157,6 +148,15 @@ let sha512 = "VMhYa4cDu5yE31OvHncAd15Rmlchih/Sr6sxFsIwkg4xzRNIIZCtwqxVXgf0TiTN9zrvlvzK7nhPqTGNqqYb2A=="; }; }; + "@angular-devkit/schematics-13.2.5" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "13.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.5.tgz"; + sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g=="; + }; + }; "@angular-devkit/schematics-cli-13.2.3" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -382,6 +382,15 @@ let sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; }; }; + "@aws-crypto/crc32c-2.0.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; + sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + }; + }; "@aws-crypto/ie11-detection-2.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -391,6 +400,15 @@ let sha512 = "pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA=="; }; }; + "@aws-crypto/sha1-browser-2.0.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; + sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + }; + }; "@aws-crypto/sha256-browser-2.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -427,13 +445,13 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.52.0" = { + "@aws-sdk/abort-controller-3.53.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.52.0.tgz"; - sha512 = "Z+4uVtgwbKSChruh6R/WIrGb5uvvXi/d6EQ7zC6hyghtn9EGQc+WJ3BVB4bIUshwMunlgjA3nDiPb5V3t5zv8Q=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.53.0.tgz"; + sha512 = "Xe7IX2mpf/qOjh1LrPnJ1UtiDw3cBlmy8n+Q2xSP5vaS/9IH0OMdQUveC9MV9HSgzICX+xzbPyUuSKc+4tufBQ=="; }; }; "@aws-sdk/chunked-blob-reader-3.52.0" = { @@ -454,193 +472,193 @@ let sha512 = "/hVzC0Q12/mWRMBBQD3v82xsLSxZ4RwG6N44XP7MuJoHy4ui4T7D9RSuvBpzzr/4fqF0w9M7XYv6aM4BD2pFIQ=="; }; }; - "@aws-sdk/client-s3-3.52.0" = { + "@aws-sdk/client-s3-3.53.1" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.52.0"; + version = "3.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.52.0.tgz"; - sha512 = "QTY12zuKqWbtLG1H2RV13JG+NFNDeDAR2Ffka/qNHU6NMUqyQnyf/1h2UCVIekTmSaR6L6bYGgHl//kxMSUwCw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.53.1.tgz"; + sha512 = "uAhjR/TAuXNct6BL/shVg2f/6Zg1EZoXTG8KIywfmLitiUF0PvYwfwSPtNohkz6czgTs/rtirAZHAQKi8jjieA=="; }; }; - "@aws-sdk/client-sso-3.52.0" = { + "@aws-sdk/client-sso-3.53.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.52.0.tgz"; - sha512 = "IvtZlZopWlWg6xnKSXAodWQaPcRySNBJLj68K6HJ8OVvBCgcXr53nNREArgPi0+KDzLsXqAZTRxvU5do/99PrA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.53.0.tgz"; + sha512 = "X32YHHc5MO7xO4W3Ly8DeryieeEiDOsnl6ypBkfML7loO3M0ckvvL+HnNUR1J+HYyseEV7V93BsF/A1z5HmINQ=="; }; }; - "@aws-sdk/client-sts-3.52.0" = { + "@aws-sdk/client-sts-3.53.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.52.0.tgz"; - sha512 = "tPLHYY9RdWehBQlyrwOaw4B31PqW1HmNNKJ3+Hc6KnEaiOwMAwQd8L7BFbSVG8ajQBDAEBUTDAkSaZ8jTYdfQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.53.0.tgz"; + sha512 = "MNG+Pmw/zZQ0kboZtsc8UEGM9pn8abjStDN0Yk67fwFAZMqz8sUHDtFXpa3gSXMrFqBwT+jMFXmIxqiq7XuAeA=="; }; }; - "@aws-sdk/config-resolver-3.52.0" = { + "@aws-sdk/config-resolver-3.53.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.52.0.tgz"; - sha512 = "XKUCpPLMwdlqPtwutdMfAHWqGEPTDd14Dp01WyNhVtmTmsHkpFfLPpELLO1BczDS+jyoMUj+UDj9jHm4YLvXXg=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.53.0.tgz"; + sha512 = "wAqP/xNx49H1dutHWHjhKduaKtAcDg2KoH25W6peW2qXZ6OfpVcxRIBbJE4Z0yGOmFFaxw0OeH3h2ptP7tdhGQ=="; }; }; - "@aws-sdk/credential-provider-env-3.52.0" = { + "@aws-sdk/credential-provider-env-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.52.0.tgz"; - sha512 = "9R8kTMQ3udNz7fyY/0rkU6Yhu0ALYQJZQ0lFCrxtNo2Nlo9taQtZgxhtRcv+EeqbTcJs91voNNz70HLbedtBUw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.53.0.tgz"; + sha512 = "ocqZ4w7y7eay2M+uUBAD6NkhikUPoajEFX1/7iMvEFMmS5MyzjuolHPNK7Hh8lFmPyoflxaMXJVKO8C1MguA/A=="; }; }; - "@aws-sdk/credential-provider-imds-3.52.0" = { + "@aws-sdk/credential-provider-imds-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.52.0.tgz"; - sha512 = "939kfHSkMLsOfQtO2nBqC/zAE1ecTOCAs72pKvVxrluGzDry4UtwlyQ4YGC04pYBRQeRIqvIOoVbADYJy4XjmQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.53.0.tgz"; + sha512 = "aKc8POSqCi58566KhF1p8Sxt7LHehMnshyfQzNAOB7xshSxuWg41rxafnQU4Soq9Tz7q5bwkauR2CEUihv/TRg=="; }; }; - "@aws-sdk/credential-provider-ini-3.52.0" = { + "@aws-sdk/credential-provider-ini-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.52.0.tgz"; - sha512 = "MCzWWPYoZjZ3C/X8UXXf9eRqgGJc3Y1QyFXIuQzNrVhffrFkYOkOUQsG4s5TuDr1MmGfxe83XtHQgATJ0fe3zw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.53.0.tgz"; + sha512 = "g+UoJ1ikDrfpI1wHAhlrcBtX4OHxoLV6vakirpG27hhFwuMih565Q/Sjn3o5hLT8PBlWxwT2YeRuxCjtaL3cDA=="; }; }; - "@aws-sdk/credential-provider-node-3.52.0" = { + "@aws-sdk/credential-provider-node-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.52.0.tgz"; - sha512 = "SUl+t2S7xKHxAkIfuyvucKQ/JemJ/bCsuCk2qtjTSiVjrLx65Rnfw14j+44JU8U5mP+xodpKNCpgIF5PHu1kKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.53.0.tgz"; + sha512 = "sy0NeuJHOBhe7XwxCX2y+YZAB4CqcHveyXJfT6mv7eY6bYQskkMTCPp2D586hSH3c6cfIsmvLSxNhNJApj1Atw=="; }; }; - "@aws-sdk/credential-provider-process-3.52.0" = { + "@aws-sdk/credential-provider-process-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.52.0.tgz"; - sha512 = "DGaSprlcEGgFuCiXNH9moksa6/1vBmX/G/tt/ulpgFEJmKljoazIEgUse/6oPJT7t5jazydAqMRVp1HK3Jp/0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.53.0.tgz"; + sha512 = "nazHndueCa4y5jUM58OHSysb52E953r3VhmpCs0qIv1ZH5Ijs3kT/usbUq7Yms7pcpaUmpu00VZTc6IfOOC0GA=="; }; }; - "@aws-sdk/credential-provider-sso-3.52.0" = { + "@aws-sdk/credential-provider-sso-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.52.0.tgz"; - sha512 = "8Q0X4wro+sPMYkbZE/ZW+CBpjxGq/x/vv4yQh7zdHpNfANhqjTSR8tUCApemVcfPtwNhQNPpW8KrlWUIMguHdg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.53.0.tgz"; + sha512 = "EongClNxdVw+O4y+S0mZFjNeLHv1ssdAnBM/9L1PfR6sH06eikVmU6isEN2quwoKBy9HRVPaIVF075Q8QIpipg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.52.0" = { + "@aws-sdk/credential-provider-web-identity-3.53.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.52.0.tgz"; - sha512 = "+4qz0PZn9u6HRRNBO9YfIixdItukixPOtLP8tNlgriCh66BC6M1mAXXP/uq2x7kIaMRZtTo3Eey4T/tA0QMkOg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.53.0.tgz"; + sha512 = "YbysBkX3mbomHJZULxk/3jyQ7NWn6rZ68IDY28bmp8cNWajWeGzDxKmR4Y+c8gNiN2ziWjUZWfHcnZC056/79Q=="; }; }; - "@aws-sdk/eventstream-marshaller-3.52.0" = { + "@aws-sdk/eventstream-marshaller-3.53.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.52.0.tgz"; - sha512 = "RK5uWIOwae3Yzog8og3+e+k8kpRnjrg9hhOLmq2xG4m5seo7v7S5jfmb0uLX/Uqgd1vWMK5wKFJsdGhnAqykcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.53.0.tgz"; + sha512 = "Vt8OjC0hgF0rNcGPbMEROnM5SHODzRdQsG9Y+M2suWDkUqFoh8+6m4v9c/ej3iudAEydZDLcnpV9yGv/CTqceg=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.52.0" = { + "@aws-sdk/eventstream-serde-browser-3.53.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.52.0.tgz"; - sha512 = "Lo1RzjOCvOGDoyq1hdxO7YWsdyc5ZMo0+jf/SDm64ZM8jE4eRUh1iGj0kCOKIIr/tCbzhbvP4SoNDfehJ2rqfA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.53.0.tgz"; + sha512 = "B+nAlXet/NSEIzaN4fZYGwoFHBYtURuXUE+Ru4EaWyC8+vBEdeO4Vs9o/8mlZSHGiUn41QYYqiZvd+OKweTtBA=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.52.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.53.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.52.0.tgz"; - sha512 = "yCfYf2MepHPpRTsbGNNLVDbN22woSmNDM2bEeK5gDbyV23MGlnLxjekLKdBbH5M6FUqfMbpsM60gDgJgas3ovA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.53.0.tgz"; + sha512 = "4O66c1aSgfdWfbr2pUJTONReVwA4oWQ/fRMhcAMhacqbPko5+3v0Iy/vOiVCm6Isa4K2kVpOUN0L+64niE7jag=="; }; }; - "@aws-sdk/eventstream-serde-node-3.52.0" = { + "@aws-sdk/eventstream-serde-node-3.53.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.52.0.tgz"; - sha512 = "hL067bWZ875oL+l+Q1Wrhkq/V9727fHeJ1J4Kr/o84hGRnIkN7OiNDLIMyUTrGdc0I4diGUbc8FVJiRtZRmphw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.53.0.tgz"; + sha512 = "92rlY8M8+nU4mUm3j4gtJiv9HY2fGTGLSIGLukOXAUf7xuJ220L+9ZInS4ToiRgq+dOSt8cFPCxRVpQtNesBfA=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.52.0" = { + "@aws-sdk/eventstream-serde-universal-3.53.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.52.0.tgz"; - sha512 = "CDMcBJDNDJfGWz2Vk2p1Ef6JbZDVZVZDG8F7Gdhn7RsiMsFf7QiF4vcNEJwQIX25ZSerRqEitBT8nEZEDxEYGw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.53.0.tgz"; + sha512 = "Y3OjTAKhDyz2UyLE0ATmDD3RFyBfJLWeBQkpJu7qICI0XYN2tmV1mCkQUtkT3e4s+UxnuUOa55YQpdUsQUWIDA=="; }; }; - "@aws-sdk/fetch-http-handler-3.52.0" = { + "@aws-sdk/fetch-http-handler-3.53.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.52.0.tgz"; - sha512 = "pFXkCeEIcrgH8esRyUab1nnIo1cjUjrheqwb/MK3gJ363/kenT6IqYXOq0UO4mF7bn6IOz/yxODlhQIU6i1Vww=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.53.0.tgz"; + sha512 = "0CcEYarIAVAoGzu1ClO2xDq30Jii6AevDFJYR7M9yojqAMvwjP31DY4/qfPc2nCpSAd9dASR6vcx6r/RoIynVg=="; }; }; - "@aws-sdk/hash-blob-browser-3.52.0" = { + "@aws-sdk/hash-blob-browser-3.53.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.52.0.tgz"; - sha512 = "EhEXgO/cb67EHXl/F1D3vtdv695n1nIrAQLdiTOcNvdMRWLpjb2MkR3GI9tppkTabF4o3allgZVebKVeqINSMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.53.0.tgz"; + sha512 = "A3xa0o1W9/tALw0/yoXyBKfxsMlzi1BvzEgCFUU2y914yBo62FiIf1E+BX42m9MfPJ87SD+l3O5QcptMVWvarw=="; }; }; - "@aws-sdk/hash-node-3.52.0" = { + "@aws-sdk/hash-node-3.53.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.52.0.tgz"; - sha512 = "pN2dSSyyy0emFFtK6jgmzYXcJHITbfdPqR7UTQ1fj1wFvbURPN19C1f4uYbVDjuiUQX01hLclJDLnPy1BIzTGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.53.0.tgz"; + sha512 = "0xK5PSUUVOPttvCLWrrUTmrKe7Fz6njPdBYvB3ESk1whXL+TY3syJj4em63Sq6yFyeuXdqyTzqfcs9fU2puWkA=="; }; }; - "@aws-sdk/hash-stream-node-3.52.0" = { + "@aws-sdk/hash-stream-node-3.53.1" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.52.0"; + version = "3.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.52.0.tgz"; - sha512 = "Khgy6DM2Kpcqbom8dYQtH7GmxnprdQVHsKvhmkReqfksxvrwNwo+S2RCDlceGTVIkELuvyfnVd19JLQO7BnqTw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.53.1.tgz"; + sha512 = "y7pUc6EtkG3TscZR9dpR/BCauP/lRepU+Td43Oe9VUhD6l3lS3TuIHUwB7PEU7NeSU9iqWuflBVK/IBWXrfH3w=="; }; }; - "@aws-sdk/invalid-dependency-3.52.0" = { + "@aws-sdk/invalid-dependency-3.53.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.52.0.tgz"; - sha512 = "TjRzfFFiY4i/a9ry5llCQMiIwpyhIyriM2QuPgAdRaRPM076I01FohUzlAc7zgwwhCa5rpI4zRZ+auGPrU44Gw=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.53.0.tgz"; + sha512 = "qp2qRFa1a/AjZRCe6MZCpbaXo5t4enGAtch/83fuH4rRkzVOctYox1gyTGTliHk28rjMREtSgZDQZojp5/5M5w=="; }; }; "@aws-sdk/is-array-buffer-3.52.0" = { @@ -652,229 +670,229 @@ let sha512 = "5Pe9QKrOeSZb9Z8gtlx9CDMfxH8EiNdClBfXBbc6CiUM7y6l7UintYHkm133zM5XTqtMRYY1jaD8svVAoRPApA=="; }; }; - "@aws-sdk/md5-js-3.52.0" = { + "@aws-sdk/md5-js-3.53.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.52.0.tgz"; - sha512 = "M0oHeBDvXCapQvvGzzlMrkW1vRfExngB/Gn93Vmdpt97+ieHkfHgo9fU/erQKb+HwnlZbhVJW3vEgfHPLvql6A=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.53.0.tgz"; + sha512 = "+XbYdbxgWniyC7E4kqHC0z0Qsud/EMv9RuKghWLr7IwbUjfR7zix5+AVw3XR+FWrKrDAlyRBhyzG+60STliuiA=="; }; }; - "@aws-sdk/middleware-apply-body-checksum-3.52.0" = { - name = "_at_aws-sdk_slash_middleware-apply-body-checksum"; - packageName = "@aws-sdk/middleware-apply-body-checksum"; - version = "3.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.52.0.tgz"; - sha512 = "f5ynflavshbkmV4ZpcwW2WoYAP69bOpv8bUPNsiKEzL07q6ZperkIaYre9BajNMxGN+UNSoE5CQIvRGcwC6UxA=="; - }; - }; - "@aws-sdk/middleware-bucket-endpoint-3.52.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.53.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.52.0.tgz"; - sha512 = "KOq8kTzhWYiwits89pnCduL7ojijthfFR5PRvLW6IwQbPxIg/AjdO5gYbMUTLaVAO1b7LoI3ztk+lmLQ2yvjOA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.53.0.tgz"; + sha512 = "q88eevXUkUWp6e/vHGnpt8/8TjscbfW6CWGpexj3DFWt3WZhEhExcoGwwszoL4FQfMFWBL+11EKNZm2orHqDwg=="; }; }; - "@aws-sdk/middleware-content-length-3.52.0" = { + "@aws-sdk/middleware-content-length-3.53.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.52.0.tgz"; - sha512 = "U+aa8UswtEvEdt4vvX+C4b+vetSpG6PZVeGN/hZ2J0j3jQxODQtjKHU3VIO+Fvp8m9rSCtcfAPly5CcejHLeKw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.53.0.tgz"; + sha512 = "CXANhpL2MAE2tPKmu0cOf4Fd99useIj5kgX6UA+HWg/ZbJ4qBg6Q4W/nYVt+OuukeqwEEbpt3wv0lKQ8k/vINQ=="; }; }; - "@aws-sdk/middleware-expect-continue-3.52.0" = { + "@aws-sdk/middleware-expect-continue-3.53.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.52.0.tgz"; - sha512 = "1rpD1I/HwDdVAW9wBtLv34gxrfkfLEyTEj2Y/1Qh/62rMX7KbBT0CmbbO33upOqyrsJDW961Mu/d5cVZW1N3XQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.53.0.tgz"; + sha512 = "aMKtfOX9b1yx0ER0QspN2jOR/Q1ucRYEaR46yOUPjdcMHHnGxuk3kimsyGqgFm2+pPJdi9FRd9S2eC/tNjYn8w=="; }; }; - "@aws-sdk/middleware-header-default-3.52.0" = { + "@aws-sdk/middleware-flexible-checksums-3.53.0" = { + name = "_at_aws-sdk_slash_middleware-flexible-checksums"; + packageName = "@aws-sdk/middleware-flexible-checksums"; + version = "3.53.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.53.0.tgz"; + sha512 = "g069Es0Sy3So2HRz+UAwaubFKkGuxwhEf6OS9pmovY2+2yfZBOLoQmf7jS50RgbxJcUDoI7uuKZrp0BcdLDgEg=="; + }; + }; + "@aws-sdk/middleware-header-default-3.53.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.52.0.tgz"; - sha512 = "ts5kuAnLjC9HW9W/vkCrlMa4a5DG45BkOjhYhD4YZCDBt9+E/N5Pt/14jmTdTO5LQ26zVC6Z3ByBXXayDKEIow=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.53.0.tgz"; + sha512 = "eQLFdNBzydZoocnj7YDVO+AJZ3YhuImZ1GXzGsF9FN8IdSjuE4gwB8BQhG6vuUg3GVe+sI+7VUJT6h55OaDBXw=="; }; }; - "@aws-sdk/middleware-host-header-3.52.0" = { + "@aws-sdk/middleware-host-header-3.53.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.52.0.tgz"; - sha512 = "t7y0gtJyFNrS6bwluR7N2LtppA7B0SDk+uNlvOJOYnJRms89fXltyMJWl8wrv8IHHvrhRLwNEP22vvOhn3hriA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.53.0.tgz"; + sha512 = "w5qMAUgy52fvJGqzqruNJhv4BtkanE4I368zWiysmwXXL5xmpKs8TpkGqcSQw4g2wKS8MR2Yxh21LukHlsgAJw=="; }; }; - "@aws-sdk/middleware-location-constraint-3.52.0" = { + "@aws-sdk/middleware-location-constraint-3.53.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.52.0.tgz"; - sha512 = "P+RfKVXL6X+vu7e54vu73TNje15y+Jo1VEbBpFGz5wYsLlBO58e6utDYLOYLwj+WzLqShSzZX9ejZzxrOSYQdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.53.0.tgz"; + sha512 = "HtBy8L3XNbovHLVh6wtIIThsbdTsX+jv09M9Cmmu80eM1WXw5Uu6lJX6FdIQXfMXBTZjnmHRL+72CxEtsets8g=="; }; }; - "@aws-sdk/middleware-logger-3.52.0" = { + "@aws-sdk/middleware-logger-3.53.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.52.0.tgz"; - sha512 = "YbFuJAsOPvbYe64gpqmS6XmEQXwyAGwH3Y4iOp3CnrGAz/zXbwWwzb653Uby+h4PVkTZ1+RviCO/A6si9bUkhw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.53.0.tgz"; + sha512 = "jMME8OOyPHliHhVD3FaBQ+4X+FDCQovw6CYGqPdqP0JUuhR8E1LWKHV1+xRpkpOICKwBnIXrgD8/0NQo/+Z84A=="; }; }; - "@aws-sdk/middleware-retry-3.52.0" = { + "@aws-sdk/middleware-retry-3.53.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.52.0.tgz"; - sha512 = "O+4mfn7OPv1POYagKwOgdlc16AQFWa4bY05g6Y94KZ2400ywNpK+Y2cwdskyNU3OTGOlluVGR21W5eO1b+XhNg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.53.0.tgz"; + sha512 = "TKEdTLP//SjasunU3/yX7avXMxhIEDoSOaiwj77zEpPGF2NWcR99UFfqNLeJsRPCyzYScYo1JSuxIwgXHNIhyQ=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.52.0" = { + "@aws-sdk/middleware-sdk-s3-3.53.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.52.0.tgz"; - sha512 = "M9ivvdTEPFoFUgfGLdFeRxFGRh/Edq6tevSnWjdOoLTgbzq8tnuKkj9v3gKsIN+a1QWP6Ef0ThH/jyuFDcBEnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.53.0.tgz"; + sha512 = "cq2NFixf5HBctPaUUMjV97M++q18e/WDrM61lN7eMHfdXW+TlYv4tVF9y9MaE7dpoNp7G0ORLsz05JdVdUI33g=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.52.0" = { + "@aws-sdk/middleware-sdk-sts-3.53.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.52.0.tgz"; - sha512 = "NB1wHvOp+I6DXi5fPutyl9dAWvJYqzRqdi8lMeu02ub/d6nybrAjoB56za1LvGblcoEiYClf1A6dTKtmydgzFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.53.0.tgz"; + sha512 = "b9AUXYqA5jaUTpWu7wPZz43RQnmy1WGPFVHd8CvcUzFdMzwJlQeH4wq+sEdZ1KtIsz6n6TmY7vobzrScgq3ftg=="; }; }; - "@aws-sdk/middleware-serde-3.52.0" = { + "@aws-sdk/middleware-serde-3.53.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.52.0.tgz"; - sha512 = "4ZooINTdOI4+T6pEiu8xte5EEhOqbE/wqOwBzvOASk3JKElZ93u6xKP2u7UKVD6asBBYK2mDrYSy1PsU4fNl4A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.53.0.tgz"; + sha512 = "jPoou51ULWN2PpvWkDF3wLKnTezyM33NBdF89mvfnI4++Za0/NpuL12636YqWLXt2CK87u8cA2Q+7Opob7KocA=="; }; }; - "@aws-sdk/middleware-signing-3.52.0" = { + "@aws-sdk/middleware-signing-3.53.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.52.0.tgz"; - sha512 = "7FUqmZQ5DzaDJYCJ3YmOHRFEyFeohtsDQ1akWD2qekcjp16ftBtk05Fi9am5/L7pO8svVzobji/wg00Tlq183A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.53.0.tgz"; + sha512 = "r3g2ytin1YbhXCDedMfR7ZSlt1B39GWA0+J04ZZzUdevtnS2VnkFNhsanO5os/WOpVUV7iqk/ncJgSpn9LI2DA=="; }; }; - "@aws-sdk/middleware-ssec-3.52.0" = { + "@aws-sdk/middleware-ssec-3.53.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.52.0.tgz"; - sha512 = "lEswW+Hf5tvkPs6aNRbPF5/Iizh62lq4NK6bZjvQF6kqyUoIGhOehQOZMmTm6jw0058KVhrzNIKipBpi7LuF6w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.53.0.tgz"; + sha512 = "2p2QT3PNepUC5MwT+t0l9bf7MlRHw6DN6CLg4Dptgr3SFR2k8LjUp2S7dJqg4qrhXRiiO7lTZK57PaPPR90dFw=="; }; }; - "@aws-sdk/middleware-stack-3.52.0" = { + "@aws-sdk/middleware-stack-3.53.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.52.0.tgz"; - sha512 = "4OTbQ+tWc6Le7es3kSnXBzCyddcUw6Sk2GupR/1+PD9v4/qvtKXXK+uD4bMDDMfi6dTNV+2riOGBniOtBVsayw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.53.0.tgz"; + sha512 = "YanQOVUXGjm63GCZVRYPlPMl6niaWtVjE2C0+0lpCrJQYaUIrvKh27Ff40JLi3U0F89hmsYOO7yPQOPTbc9NBg=="; }; }; - "@aws-sdk/middleware-user-agent-3.52.0" = { + "@aws-sdk/middleware-user-agent-3.53.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.52.0.tgz"; - sha512 = "sfdJvAp/f4PHmQvSklFAuCpD7gqloG502gSmBAMrXKqYykvQ5SAGyr6sCZPWf8CZxKtn5n4ftg8CLKywwrKwmg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.53.0.tgz"; + sha512 = "ClKxpFXoHLhdnDxyDRRVNaFYQnfylps7rk1wfbRLWb+FWQwKWBvLq5c5ZPvznBU8BvftDSkFtrY+7OLMlj6qxA=="; }; }; - "@aws-sdk/node-config-provider-3.52.0" = { + "@aws-sdk/node-config-provider-3.53.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.52.0.tgz"; - sha512 = "vfeTzkfVtGaNQrnhCRMObqid0shxFtNFEnnU1Nnx7HsgBfag2/T6fnsDzdVGaliQ6nmfg+RMrhzw2VECyBTHQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.53.0.tgz"; + sha512 = "l00gDzU7n2WSIBHZPVW8/t6L0UD6qwtre5kuGKiv8ZkZKynPg9VV39IB/JZ7swp2uydbXuqxgDxFvqImvY3IyA=="; }; }; - "@aws-sdk/node-http-handler-3.52.0" = { + "@aws-sdk/node-http-handler-3.53.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.52.0.tgz"; - sha512 = "MjLkndwLuWye1kavyFnDw5BvK8Rg4YpMULTne++OL/uEsxWO786K+QQMyLWkirPe+ELMEYu/3eOrQTly2tqHsA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.53.0.tgz"; + sha512 = "YqovPyn75gNzDSvPWQUTAEbwhr8PBdp1MQz65bB8p+qOlzQi1jGCyj1uHqG7qwVIlis9+bAfqpAqNDuYpdGsNg=="; }; }; - "@aws-sdk/property-provider-3.52.0" = { + "@aws-sdk/property-provider-3.53.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.52.0.tgz"; - sha512 = "Ooam7CvGefHKhMwQ413MiEtDTFw70xbCduJCF7Bg1F0WKrf700M/Yte+q3E0ljlXWJ28rwJNgwW3ptZaSXMGPg=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.53.0.tgz"; + sha512 = "qrVFYcOV/Da7/ozW2bDLDz0JQP0NLIn6/eNUwT2fqKVw9MWcrLf6xtyAJhCwckdUVOWS2HoBSyvEopa4mdh9Sw=="; }; }; - "@aws-sdk/protocol-http-3.52.0" = { + "@aws-sdk/protocol-http-3.53.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.52.0.tgz"; - sha512 = "L6ITU9NG0L6nyYfzhSLa0EsgDlyL1vHNz+Om9o7TayUUF7O0f3UiZToWf2hdETQ04Os8625aZt0VH92ZnYyeEw=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.53.0.tgz"; + sha512 = "lKOXq2FjQH2i/ztJOKHoNgJ9Kpaprhb6/lsKMjHuePr/YDEzp62nEuJKbVx5rA9C8Rxuuj2hE8vXhQ6dyUIsjg=="; }; }; - "@aws-sdk/querystring-builder-3.52.0" = { + "@aws-sdk/querystring-builder-3.53.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.52.0.tgz"; - sha512 = "RfNXqKeR6mdg2n2LO5Vs2Bz+f47/KN5k36HWk04bSwIbhnBtslXBp0F1KgSPkeP56KEgmmUWldRD7g8BvDkgAw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.53.0.tgz"; + sha512 = "oliOrup52985pSKOjHbbm7t3bGL0HTPs9UODhBuDpHE7l0pdWE1hv9YiU3FF5NUIF25VwbL83GYmL9R52GxZhA=="; }; }; - "@aws-sdk/querystring-parser-3.52.0" = { + "@aws-sdk/querystring-parser-3.53.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.52.0.tgz"; - sha512 = "/A6PauieStZajbkxX3sZSBBDacGDc3I/Sk7rjJulmg1GnizeVcUgx1OUdDh1JasdqA1h9E3ks/Y2Lu3xUMctLw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.53.0.tgz"; + sha512 = "wEkS40w/wW4eBSnf7xt+m8InZFVzjLAzRYK1yPab2qfOIShpWgxg1ndqEP0eu14MvwdEfMPW9xU6J2AiWoxWng=="; }; }; - "@aws-sdk/s3-request-presigner-3.52.0" = { + "@aws-sdk/s3-request-presigner-3.53.1" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.52.0"; + version = "3.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.52.0.tgz"; - sha512 = "6TGPTP5L3+nfOR5K+AQNS1NDp1aYxozQ5vW4KGI+P1XVnLZZ36Ey3VoCdrmI2b6b8qy9pT3c3bXfPwEN4gSIOQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.53.1.tgz"; + sha512 = "Ym6Ll3SV9dGb8MlAJz6bCLEeFSbFFtSsBtIT9X9edofXD61o/gIbs6SWpoTBnTLezLcqtA1qWaIl3PcMitGP7Q=="; }; }; - "@aws-sdk/service-error-classification-3.52.0" = { + "@aws-sdk/service-error-classification-3.53.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.52.0.tgz"; - sha512 = "2bpSIZCx5VGp2CBTeXK6PxlBYWrn2wiqxBVYstDRExZ8P7edcwPRgWi8qaKgPM2wvstZwJieF774niiuLddIpg=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.53.0.tgz"; + sha512 = "l5g8QncKk0ZmzQL7mWyQ6n5xWkd1XQJuoOfLZPBas9SJAyz7wanV5P3CG9PX6s1GVHWLC+2MafpIQ6+aH1x5cQ=="; }; }; "@aws-sdk/shared-ini-file-loader-3.52.0" = { @@ -886,40 +904,40 @@ let sha512 = "tALb8u8IVcI4pT7yFZpl4O6kgeY5EAXyphZoRPgQSCDhmEyFUIi/sXbCN8HQiHjnHdWfXdaNE1YsZcW3GpcuoQ=="; }; }; - "@aws-sdk/signature-v4-3.52.0" = { + "@aws-sdk/signature-v4-3.53.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.52.0.tgz"; - sha512 = "lSlDASXGLup5v12kclzT2ZLoUnnVLknSRcMXrTVjnX7spmHMbs6s7LOcN0RXZzFIACs7vW+930KUzhBxt8UiFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.53.0.tgz"; + sha512 = "CUvCIrwiiWpJd/ldSA04RERXPsdvkuKW3+gBDIUREq4uc7co7Cml1/wbIJ0UOHAmJpDw82NDYqAUthYB1kbHrQ=="; }; }; - "@aws-sdk/smithy-client-3.52.0" = { + "@aws-sdk/smithy-client-3.53.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.52.0.tgz"; - sha512 = "GuOJuoA1kky/v2p7byOZGq7YOiu2Ov8DA3d58gM6L/q7XavBjnzwNB/BYU7SPU3Ly6S7qGxBJFeadufic4bCYg=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.53.0.tgz"; + sha512 = "/mZn1/1/BXFgV5PwbGfXczbSyZFrhUEhWQzPG7x1NXLQh3kcSoHGDSONqFhqTeHWkfEXp1Tn0zUe7R4vAseFmQ=="; }; }; - "@aws-sdk/types-3.52.0" = { + "@aws-sdk/types-3.53.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.52.0.tgz"; - sha512 = "5deI1v6Fr7/a+TT9hPuiy6I/L/7uJTda3q3DEvUd0CsGbBB/fcDXJg8jlnMHcmw7mkfP9vE553ZJQS3Cb0v4vg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.53.0.tgz"; + sha512 = "FqHfWRXdnQvfxgngDKfYpYOuQ1HmPgxaGKELx3pFaEnQdMo/dMXjfBGQcEQgP8jqU6bPLaJSfykjWjDzua8JBg=="; }; }; - "@aws-sdk/url-parser-3.52.0" = { + "@aws-sdk/url-parser-3.53.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.52.0.tgz"; - sha512 = "/9OJwol/384jsISiAs5JX7fkgd9mv7hJsHFCVXnByim5qTZu1V9fMcJYJ1L3iRmfCRy0w75UDJljIx2RZnwAYw=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.53.0.tgz"; + sha512 = "lB0U5TkBDSdJK8h3noDkSG/P1cGnpSxOxBroMgPHA8Lrf5lmFRMvDXLXMhRDnTiqtsd/DpHDPyat91pfwLVEwA=="; }; }; "@aws-sdk/util-arn-parser-3.52.0" = { @@ -985,49 +1003,49 @@ let sha512 = "1wonBNkOOLJpMZnz2Kn69ToFgSoTTyGzJInir8WC5sME3zpkb5j41kTuEVbImNJhVv9MKjmGYrMeZbBVniLRPw=="; }; }; - "@aws-sdk/util-create-request-3.52.0" = { + "@aws-sdk/util-create-request-3.53.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.52.0.tgz"; - sha512 = "j2KJf4SsAuMNZw92T+ti8VoJ1wILlZl81+3ZvIWho4k3hvjf05eXH/l4P0tZ7aCRfljx+NoaJbuKAT7XcpDQ5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.53.0.tgz"; + sha512 = "yRc+XGz8oUxBLd1ikluRJ4pltP2fORjTvaLLou5sK/jsougPhGmSKcUgvz4rublwUU5L7zeFLk3ndrcg2b5AKQ=="; }; }; - "@aws-sdk/util-credentials-3.52.0" = { + "@aws-sdk/util-credentials-3.53.0" = { name = "_at_aws-sdk_slash_util-credentials"; packageName = "@aws-sdk/util-credentials"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.52.0.tgz"; - sha512 = "fNcm2cNzDHWt5Pr6xD2FXA40jkcgClsbumuI0VBhLEyNLfoetwPImKTpqbxo1XfWVxhqIbT/ELnrbS2OYBRIXg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.53.0.tgz"; + sha512 = "XP/3mYOmSn5KpWv+PnBTP2UExXb+hx1ugbH4Gkveshdq9KBlVnpV5eVgIwSAnKBsplScfsNMJ5EOtHjz5Cvu5A=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.52.0" = { + "@aws-sdk/util-defaults-mode-browser-3.53.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.52.0.tgz"; - sha512 = "N2/DHJ/OfiQ5zP97k9cJ8jSGiWDjtR7oFqXR+wbKZzKOww6vencMPYlndU6v1uZOKEjoj+NBr5N0jPEjCz+6+g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.53.0.tgz"; + sha512 = "ubOcZT3rkVXSTwCHeIJevgBVV5GHnejz3hd+dFY9OcuK53oMZnFPS8SfJLgGG6PHfg30P8EurKv1VhWrbuuJDw=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.52.0" = { + "@aws-sdk/util-defaults-mode-node-3.53.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.52.0.tgz"; - sha512 = "vmbvirg5edfNKBin8Mup2noxgqIYzYPnvk+BgIx3jFPvwT57WGRs/ahOMNqHgv/6xAdVaUjz8g7gw9Yy3mwP3A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.53.0.tgz"; + sha512 = "84nczaF0eZMRkZ7chJh7OZd4ekV31eWmw8LOTJ4RQeeRy+0eY8th23yKyt5TU+YgmMLrY0BVK7103BQAI/6ccQ=="; }; }; - "@aws-sdk/util-format-url-3.52.0" = { + "@aws-sdk/util-format-url-3.53.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.52.0.tgz"; - sha512 = "Rkfz6dz4sPh0poMmaQIf7e0q2XrQic4D0Wx99N3+OtT/WHQCR8UAjyijxC5jDQwhyNkqNNdIYQd7Xz5o6X9eRQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.53.0.tgz"; + sha512 = "+r80EoHjk8sN/GjZ90JdI3a5mNKcnEWU6TL+C+cRkCMbdAXMGOCsnt3C567IcpGU3dUba/UcYA9Y2Y34FzpetA=="; }; }; "@aws-sdk/util-hex-encoding-3.52.0" = { @@ -1048,6 +1066,24 @@ let sha512 = "l10U2cLko6070A9DYLJG4NMtwYH8JBG2J/E+RH8uY3lad2o6fGEIkJU0jQbWbUeHYLG3IWuCxT47V4gxYrFj7g=="; }; }; + "@aws-sdk/util-stream-browser-3.53.0" = { + name = "_at_aws-sdk_slash_util-stream-browser"; + packageName = "@aws-sdk/util-stream-browser"; + version = "3.53.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.53.0.tgz"; + sha512 = "oh+PVTeo7nvkuXwlrAy6TErTpzTRrtxaL+2ErTFiLFPPFKK2/0X0E12zoNB0DMaY48sRdkJmrlLbOtxGDS1rNg=="; + }; + }; + "@aws-sdk/util-stream-node-3.53.0" = { + name = "_at_aws-sdk_slash_util-stream-node"; + packageName = "@aws-sdk/util-stream-node"; + version = "3.53.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.53.0.tgz"; + sha512 = "Hubb2cvn2idlNsHkJ5v46wW+cvodLySGJCqTat5kUAoOxR20ZFG3P3R6InU85PAh54zZTRvURuD0UM0uPtIQYQ=="; + }; + }; "@aws-sdk/util-uri-escape-3.52.0" = { name = "_at_aws-sdk_slash_util-uri-escape"; packageName = "@aws-sdk/util-uri-escape"; @@ -1057,22 +1093,22 @@ let sha512 = "W9zw5tE8syjg17jiCYtyF99F0FgDIekQdLg+tQGobw9EtCxlUdg48UYhifPfnjvVyADRX2ntclHF9NmhusOQaQ=="; }; }; - "@aws-sdk/util-user-agent-browser-3.52.0" = { + "@aws-sdk/util-user-agent-browser-3.53.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.52.0.tgz"; - sha512 = "zmw9pJ91QAr1oF3uqLKuo/3++NrSEagLwz3xnuID5wN8WLAgbC6MkvM7FG+r11CHSoUX3IeB6YDqoBMQW8en8w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.53.0.tgz"; + sha512 = "fJsxzjo4UMv2o6KYSvw8cwfDhAQiao3X+iY1lGNVKrcY2bnI4zW5pWYge94oIJXMyFjjg6k6Ek+JIvGLMFY0XA=="; }; }; - "@aws-sdk/util-user-agent-node-3.52.0" = { + "@aws-sdk/util-user-agent-node-3.53.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.52.0.tgz"; - sha512 = "jqbyb6R4goWOTIESizmNPy1i3Xa25Q3QG0xt6Pct0DwLQUSVpnPHw07NmfRhql+eYBoD4uxpXDX9lWsuLUBi0w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.53.0.tgz"; + sha512 = "YbrqMpTi+ArL9qG+NIXPInmnjGwYu0lohiH5uyEMHAHolqg4vqdKBlXyZ7Pjls2Nka7px2UUfX/Ba2RIssBBMQ=="; }; }; "@aws-sdk/util-utf8-browser-3.52.0" = { @@ -1093,13 +1129,13 @@ let sha512 = "fujr7zeobZ2y5nnOnQZrCPPc+lCAhtNF/LEVslsQfd+AQ0bYWiosrKNetodQVWlfh10E2+i6/5g+1SBJ5kjsLw=="; }; }; - "@aws-sdk/util-waiter-3.52.0" = { + "@aws-sdk/util-waiter-3.53.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.52.0.tgz"; - sha512 = "8Gx0NunIg1RFpnKSA3nwzDl5j8mJ42kWjy5sHgd4wfUyiXRSvTl69sV6O8qhleI9OMDV0iS4xHZBCLK11HdIoA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.53.0.tgz"; + sha512 = "WyiyHOzmiapbbwB8dtu7axRqu9u5+Mnp1/+k2Ia7cm0UMUTKLjdixPsaM89HNre3EMa8WHrDBnwyVmo/Khbq3w=="; }; }; "@aws-sdk/xml-builder-3.52.0" = { @@ -1129,13 +1165,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.17.3" = { + "@babel/cli-7.17.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.17.3"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.3.tgz"; - sha512 = "1+WRlh1IqLocOp122CLx4if345RSHMspwIZNJTlqG/GA46HVZC6p49N1kolfdd2/GOdr+tu4nScbAR3ACJ2ZiA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.6.tgz"; + sha512 = "l4w608nsDNlxZhiJ5tE3DbNmr61fIKMZ6fTBo171VEFuFMIYuJ3mHRhTLEkKKyvx2Mizkkv/0a8OJOnZqkKYNA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1228,13 +1264,13 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.1" = { + "@babel/helper-create-class-features-plugin-7.17.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.1"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; - sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; + sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -1318,13 +1354,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.7" = { + "@babel/helper-module-transforms-7.17.6" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz"; + sha512 = "2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -1507,13 +1543,13 @@ let sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.7" = { + "@babel/plugin-proposal-class-static-block-7.17.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; + sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -2389,31 +2425,31 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@cdktf/hcl2cdk-0.9.1" = { + "@cdktf/hcl2cdk-0.9.4" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.1.tgz"; - sha512 = "0AOiSGa8qd0lcGwwayrl3N/mAeTFkNrKndILCDMuh9gLFfXLTxVEq2oqp5LbO5YX2i/cFMCjZ/vscXXQuCVjCQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.4.tgz"; + sha512 = "sUg9GsmaFpqqfoGcqibMEDHozMQhaDOxBT3Dz3ioNc0SSWhBpDRwrlctK3rNNKvWUetEeUr28L7SJR/I0TSd+Q=="; }; }; - "@cdktf/hcl2json-0.9.1" = { + "@cdktf/hcl2json-0.9.4" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.1.tgz"; - sha512 = "pM6cLkPl4hMTj9XhjKz7MEowUHnzq8hY8uk8ro32OQsZVZpsl9CDG83ox0VwgI1YSvXU7GyzP4iPOPn63U7PgQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.4.tgz"; + sha512 = "dZZUi94C7TFs0E8IubNYu38mBncVlQVUeGp6nA3tYxs/ue1igKqx7+mWfZP7NYVOSlggMGRNaTts6ZA0UAtOYQ=="; }; }; - "@cdktf/provider-generator-0.9.1" = { + "@cdktf/provider-generator-0.9.4" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.1.tgz"; - sha512 = "BF4Z7eiSFHKx0NrIiB2fHCq0G8Mx2q8bLbij9KBxAD80BwX1lNKEzut6JUhe6qOrC0yOkAV4PWElbK9g66pJgg=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.4.tgz"; + sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ=="; }; }; "@chemzqm/neovim-5.7.4" = { @@ -3370,13 +3406,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.1.0" = { + "@eslint/eslintrc-1.2.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz"; - sha512 = "C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz"; + sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; }; }; "@exodus/schemasafe-1.0.0-rc.6" = { @@ -3775,13 +3811,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.3.1" = { + "@graphql-tools/batch-execute-8.3.2" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz"; - sha512 = "63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.2.tgz"; + sha512 = "ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3793,13 +3829,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.5.0" = { + "@graphql-tools/delegate-8.5.1" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.0.tgz"; - sha512 = "P2LLahWpv8eFrqXQi9v/NDLxLBKAugd3rmB8lxeTnCqma19ZM/VaSpvGAgGyjjHKQe097mAeBEkM/7uYbG/NFg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.1.tgz"; + sha512 = "/YPmVxitt57F8sH50pnfXASzOOjEfaUDkX48eF5q6f16+JBncej2zeu+Zm2c68q8MbIxhPlEGfpd0QZeqTvAxw=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3811,22 +3847,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.3" = { + "@graphql-tools/graphql-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz"; - sha512 = "6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.4.tgz"; + sha512 = "Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg=="; }; }; - "@graphql-tools/import-6.6.5" = { + "@graphql-tools/import-6.6.6" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.5.tgz"; - sha512 = "w0/cYuhrr2apn+iGoTToCqt65x2NN2iHQyqRNk/Zw1NJ+e8/C3eKVw0jmW4pYQvSocuPxL4UCSI56SdKO7m3+Q=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.6.tgz"; + sha512 = "a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3838,13 +3874,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.3" = { + "@graphql-tools/json-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz"; - sha512 = "CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.4.tgz"; + sha512 = "1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3856,13 +3892,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.1" = { + "@graphql-tools/load-7.5.2" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.1.tgz"; - sha512 = "j9XcLYZPZdl/TzzqA83qveJmwcCxgGizt5L1+C1/Z68brTEmQHLdQCOR3Ma3ewESJt6DU05kSTu2raKaunkjRg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.2.tgz"; + sha512 = "URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -3874,13 +3910,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.2" = { + "@graphql-tools/merge-8.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.2.tgz"; - sha512 = "2DyqhIOMUMKbCPqo8p6xSdll2OBcBxGdOrxlJJlFQvinsSaYqp/ct3dhAxNtzaIcvSVgXvttQqfD7O2ziFtE7Q=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.3.tgz"; + sha512 = "XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3892,13 +3928,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.1" = { + "@graphql-tools/schema-8.3.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz"; - sha512 = "3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.2.tgz"; + sha512 = "77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -3910,13 +3946,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.7.1" = { + "@graphql-tools/url-loader-7.7.2" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.7.1"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.1.tgz"; - sha512 = "K/5amdeHtKYI976HVd/AXdSNvLL7vx5QVjMlwN0OHeYyxSgC+UOH+KkS7cshYgL13SekGu0Mxbg9ABfgQ34ECA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.2.tgz"; + sha512 = "7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3946,13 +3982,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.1" = { + "@graphql-tools/utils-8.6.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.1"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz"; - sha512 = "uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.2.tgz"; + sha512 = "x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3964,13 +4000,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.0" = { + "@graphql-tools/wrap-8.4.2" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.0"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.0.tgz"; - sha512 = "fPB3+UnxLIPWDfMvAfBQnGmm8rrejeQjmCy7h9avWHBbkEELcvtrSWnKAvoKowe+WR9PVDM15XQ/PQvcddV0kQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.2.tgz"; + sha512 = "U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ=="; }; }; "@grpc/grpc-js-1.4.4" = { @@ -3982,24 +4018,6 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/grpc-js-1.5.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.1.tgz"; - sha512 = "ItOqQ4ff7JrR9W6KDQm+LdsVjuZtV7Qq64Oy3Hjx8ZPBDDwBx7rD8hOL0Vnde0RbnsqLG86WOgF+tQDzf/nSzQ=="; - }; - }; - "@grpc/grpc-js-1.5.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.3.tgz"; - sha512 = "q0xgaZ3ymUM+ZOhe1hdocVSdKHCnJ6llLSXcP+MqMXMyYPUZ3mzQOCxZ3Zkg+QZ7sZ950sn7hvueQrIJZumPZg=="; - }; - }; "@grpc/grpc-js-1.5.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -4018,6 +4036,15 @@ let sha512 = "FTd27ItHlsSG/7hp62xgI9YnqSwRbHRSVmDVR8DwOoC+6t8JhHRXe2JL0U8N9GLc0jS0HrtEbO/KP5+G0ebjLQ=="; }; }; + "@grpc/grpc-js-1.5.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz"; + sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ=="; + }; + }; "@grpc/proto-loader-0.6.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4108,13 +4135,13 @@ let sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; - "@humanwhocodes/config-array-0.9.3" = { + "@humanwhocodes/config-array-0.9.5" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; - sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; + sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -5602,13 +5629,13 @@ let sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; }; }; - "@nestjs/schematics-8.0.6" = { + "@nestjs/schematics-8.0.7" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.6"; + version = "8.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.6.tgz"; - sha512 = "IgWuplXg3I+2lzQqy5jR45C+EpBiOuPQwh8zWCjlQDYU9/X/2a8B8byJXw3nuguZS/huuuXx3ZhfHJKQYk6uIA=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.7.tgz"; + sha512 = "7k+eMMBUwvXFp6vwZ5byiLBEQKzjMyIJwO46ginoFugt2AXrOt0iUhR3BKFuWDBZaYQ1l4az86UGw5ohgH3wow=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5845,6 +5872,15 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; + "@npmcli/run-script-3.0.0" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.0.tgz"; + sha512 = "jIdmUepw+kVP2WEE/+XrBIvrSF5miDutdGBrQ8May6uHVAvpAb0m3NRHcJ0lKWbQ1BxsRFsmTrjkdY99qTTVIw=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -5926,13 +5962,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -6160,328 +6196,400 @@ let sha512 = "7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg=="; }; }; - "@ot-builder/bin-composite-types-1.3.3" = { + "@ot-builder/bin-composite-types-1.4.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.3.tgz"; - sha512 = "E0l5ixtUowsGzGDP++wMQz64rm8IVCvcIz5NKHtOhs1RIzWT58O5EybSxGBvVBstP2jprMsiGCxjZJ9rhHmrqg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.4.0.tgz"; + sha512 = "OzEsssOyEKy1setspPKun8E6tlDpFguLQwCAN1iK9HsrJwgK1lqcwA+PDUxwEIcKj6zaSDI9fb53v6WnsSSf5w=="; }; }; - "@ot-builder/bin-util-1.3.3" = { + "@ot-builder/bin-util-1.4.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.3.tgz"; - sha512 = "76pe9Wz431PyOek445P+j/CwcRJaIZqItLL+oe/HAsWNLeAudh/GF1NdK6jKrjJsGa1sGbJUWuGfklpvY9IoBA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.4.0.tgz"; + sha512 = "5OMGopgGimoKoHjag2YtPeAyGp3JzMaclzoh4Npelj1hNLebWfdmcKdE3zcixk5eMK2KTr1aKZMCvbbIPhUHFw=="; }; }; - "@ot-builder/cli-help-shower-1.3.3" = { + "@ot-builder/cli-help-shower-1.4.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.3.tgz"; - sha512 = "Judhkaz9m8dsjz/xESy3WJY7xmcnjD40A51Mg8H+EcA+Zyl2PsRguGjeYK5GP0YZpCDq73cPvt9IqXbU74HDKA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.4.0.tgz"; + sha512 = "1tPeg1TGW1EvJhseA0J12tfQhz1R+YocU0/9HpdUiw2Ny9f8KnY/Z4jM+6KrNXPBlqJf3U7h5D/Mqaa+8I6ROw=="; }; }; - "@ot-builder/cli-proc-1.3.3" = { + "@ot-builder/cli-proc-1.4.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.3.tgz"; - sha512 = "Afd6KU7iarOt8OJYJGWMU9tR2Hm4TCcvRHTq2kJns7rn7leJnJFvteRPLZwBFGIc0qlkeJ/w7uF0YBnnlSLWqw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.4.0.tgz"; + sha512 = "IiUQNzhV4qWix6cG2gUjyJ0DEiphgOp4sFCNssMy5so1J1635qTYmkodTWgynVKQ31qCiamtS5+WMtNIwjlodg=="; }; }; - "@ot-builder/cli-shared-1.3.3" = { + "@ot-builder/cli-shared-1.4.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.3.tgz"; - sha512 = "9isYiHmyRNDBhU+Zg55DcHFn/9uzD8O46r3+6BPO8X8YWXp6cOpEKzhgf3yfzCcJxplGrOKoUTR2PWj3TIaO1A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.4.0.tgz"; + sha512 = "PhYzNdTC5rTpwkT0PFmiWHVkJZBHZN82HPAtsEHyL3nPKK3ygxReNo1FYVQ5DfO9PJE1NxYKv9AqrMAjL1IhNQ=="; }; }; - "@ot-builder/common-impl-1.3.3" = { + "@ot-builder/common-impl-1.4.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.3.tgz"; - sha512 = "+ijxOzqDER1qC1uC9JwIo5xyoHPB4vdY1YMvqZD+6JLO7AkiUjqqJlihnp1Xq7s0+WpySru45P+2S+ZI6J4X8g=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.4.0.tgz"; + sha512 = "tK6UV2dEkWi4cj7v0miMVhGuHOhcAOoqNkzWoyNgbqevzvftvX+FR2TxDrRgDJ00928yaSpxs5Luk+nLZetDwA=="; }; }; - "@ot-builder/errors-1.3.3" = { + "@ot-builder/errors-1.4.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.3.tgz"; - sha512 = "i+i1/NFGysYbDeFSwikmbq/HLfpgJ7vXTviJMnZn1/JIYXscfrw01lqYpCnAmKrUXSbYqOc6pKWycS0IIzYEsA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.4.0.tgz"; + sha512 = "DriKgSnAXxXFynOZHABycRdd42xLc7O45TGusTIo5r9HE8oF24IadBch1MWxQVuJtfakIcjy3lgIYmAjTkxzfw=="; }; }; - "@ot-builder/io-bin-cff-1.3.3" = { + "@ot-builder/io-bin-cff-1.4.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.3.tgz"; - sha512 = "qcqWuo2WtR+MCFsTS1a0ieLH8+0KUaqpkXbhVha5y1eeKRIYsPaLS5Uj5IAApuLX6F6eZgaKiZkR7CqeBMwIGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.4.0.tgz"; + sha512 = "4qbs6oCwxdUFJYfnHgoyGRbRmH0if8XfIIbcpqfxaXOdNCI2tE+t49svUNmwwzx/tr3TvGH5Q98fvJghbkBtpg=="; }; }; - "@ot-builder/io-bin-encoding-1.3.3" = { + "@ot-builder/io-bin-encoding-1.4.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.3.tgz"; - sha512 = "fE+RI5fc1FqXr8q96Ne6x12UStz2m/RjS0PbKO9X5/lxg0JaTKHdtJ65M6RX1kxLUO783P1NlibLliiuXWTg4A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.4.0.tgz"; + sha512 = "7RWM4N5/TjIflBJ5i/Gvbis2A9yAnVPdS/MGJTbgfLQkRKaZPajpf3JlIiV7OSnixm89i3wmspHVeadueqDpMQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.3.3" = { + "@ot-builder/io-bin-ext-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.3.tgz"; - sha512 = "CyLwG038inIozQtn4bWclc13EWynWALO4LGPcgLMRmD1UsS4LbMRuoGJ02p70+uxsKLaHgA2RjC63g02IbIjmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.4.0.tgz"; + sha512 = "amQJaRUMhgun9MzhJQkfkwH+P3RidMePeeBcMCexgMweouCcKMuAvju6rZsysybad3V/BdCwEap3wjiqkPQuWQ=="; }; }; - "@ot-builder/io-bin-font-1.3.3" = { + "@ot-builder/io-bin-font-1.4.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.3.tgz"; - sha512 = "b3aHYfGAwJShZe9mmZAJXFXpklZspUBjf69FuujkbA5teQl7w6GdwXOiwhavtsNwHuNC2We7Oh9wp1vnLSceXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.4.0.tgz"; + sha512 = "sJ+rMKLH63H6spdsaSdTgYmFBDDoMy22YCINtOEQRmQgbV9nuiElsJr8LSA6LlXN5joQU3y12D2oA2m044y0Uw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.3.3" = { + "@ot-builder/io-bin-glyph-store-1.4.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.3.tgz"; - sha512 = "yJPth9RyOLvyO/wGm+axfBSOPUqkgiVUeOSMSpLHM+ujhrZXW0OW9Xbxij+9QLsZrxI9mpEWkdWygWWBUceD/Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.4.0.tgz"; + sha512 = "NiQOkjDBQ8SLdX9vVu/9/7/IOowDGEBT/dkM3rzAOGJEj/DxRcWc5uR1z3nE2m/DaGWkTfigV4yk+HO+DQnoog=="; }; }; - "@ot-builder/io-bin-layout-1.3.3" = { + "@ot-builder/io-bin-layout-1.4.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.3.tgz"; - sha512 = "8fnXYL73O7GsvrQNqDtzbzChGVbyzH6J1a04I+M0H+BUW6u0XY0FJkUtfF68xzju4eyrkOZc/ElDbXouADKWug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.4.0.tgz"; + sha512 = "rMpXHBYc7rft8HohcZw7OEs1FLphxbQ3UCgltB5PGvBZH7R2nfaYwdzXfXdStHJM0oiI3nx+C7VEl26hAqM6DA=="; }; }; - "@ot-builder/io-bin-metadata-1.3.3" = { + "@ot-builder/io-bin-metadata-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.3.tgz"; - sha512 = "onYKN6OrUBclDaZiyhXZhTcSf+KfvqW9lwsEaKyYTh0ZOZ/ButSvwxNtrMjzekGFzK0izIQft3oWhXkUyapnzg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.4.0.tgz"; + sha512 = "2ygSsCMTvjN5+sd//d+lnqmSwTA04yDYCSnYMQy8k37nJk2xo7VsKnKynUBJPmZ2Km70eT+XaYZyxqqQQw4Mew=="; }; }; - "@ot-builder/io-bin-metric-1.3.3" = { + "@ot-builder/io-bin-metric-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.3.tgz"; - sha512 = "fngm7u0BSyet87WijLs/TOXF4y/NkadxZK8NWvyRiEC6hU/d20Tfen6eqit+UB3RBBicbZdCjeJvUqTzq2BRhA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.4.0.tgz"; + sha512 = "ysgatN4dr16nYBFv4mAPbcs6DhbuW/roZtJyVFfil0JtmSa1AJfDbkAxLIA0Uuxay1j7d6ynhK4ojRd4C+rcOA=="; }; }; - "@ot-builder/io-bin-name-1.3.3" = { + "@ot-builder/io-bin-name-1.4.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.3.tgz"; - sha512 = "hWuqZyIdUjfxiVTZ9pa4KZe1srH+88lXkoIGupfz1cibMIM98sgwNkcjT0tjFiyH18SBMQBIxhwmfMRWBj4kKw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.4.0.tgz"; + sha512 = "gNLWNlUeIBDybRjT9lwVavbWrswGQ4ixy/SFuAC2D9qIbJeGxrMF9Bb7yid7+g9Z5CV4cPeoxc9s4GRW0viBOw=="; }; }; - "@ot-builder/io-bin-sfnt-1.3.3" = { + "@ot-builder/io-bin-sfnt-1.4.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.3.tgz"; - sha512 = "CkXXxwwvxgxHZwYx0Tv7cxcvT8yXCF8MusSV51n9On2h/YB3m/uCevna7/E6Jf5MpzHkyICiWYwe6tV+fv5xXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.4.0.tgz"; + sha512 = "JsjkrKdMxo93LsNKCaB+ind7tr3kwQz3K/yvLktfteSPKwNkyB1Tl+knwsa3btk/M8v8t3mBazssQz5R2S6+lg=="; }; }; - "@ot-builder/io-bin-ttf-1.3.3" = { + "@ot-builder/io-bin-ttf-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.3.tgz"; - sha512 = "8stTcg6ulB5N/I3wXsM2Tq71Xnf13JehvXruwNfroYiNLtiWc8NRGlo/PDRB5xbLURv8QeyP0SxUy0ZV9VGXhQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.4.0.tgz"; + sha512 = "L57uAa6PkuZ5basqRHgV2YIam6oDM3UaelnTrskeiIdWBHuqutK3a8wFvG71fd3zcqITrrKghHIV6GrfgLWYPA=="; }; }; - "@ot-builder/io-bin-vtt-private-1.3.3" = { + "@ot-builder/io-bin-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.3.tgz"; - sha512 = "hPAibMtIX1WynkNDME+pWph/lU166XXJPrEkKLZ5kEl9XPbAzk+JS6TKnX38AEqGx5lWlc5Fx26slYyqksR48g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.4.0.tgz"; + sha512 = "lx37kO2n6pP3na+zwnSiqJ1XecI1sfF7nklclg8uoCROE87WbEmDbBzsgkqXBxHYZ3pVj1ZDydih6NaLXJ9w8w=="; }; }; - "@ot-builder/ot-1.3.3" = { + "@ot-builder/ot-1.4.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.3.tgz"; - sha512 = "e0apRiFxboGKw24eg8uTp0NxkI3KPtNIoztOmJWQTaSXMS78QbzWDAXX8yy94qnL6mu+aN7u1H8f67zNtMH1DA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.4.0.tgz"; + sha512 = "LCJOmacVoVJfeEPb+it3XtYkoz8Q/RBUBgmnHRmovaI0lGLSqK0hOfauaIRap9USS00hT17s7QDPeST+lvlAQA=="; }; }; - "@ot-builder/ot-encoding-1.3.3" = { + "@ot-builder/ot-encoding-1.4.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.3.tgz"; - sha512 = "syxPDRoAezIQA/Z/DDPSF2AQ3N9vWaypTvbUPmdLEqriOZFDAx4fR455B8gqZKIeg3FFAjXLMCtaDR1sftp74g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.4.0.tgz"; + sha512 = "qs8+zx1Ebj2sQyYJjv1BgTKYECNqvA7HZYdVjs2reHm27YwI5uoamQAJ0rQ6+H2xp1pxCI9qRNMAucKkF5Hx3Q=="; }; }; - "@ot-builder/ot-ext-private-1.3.3" = { + "@ot-builder/ot-ext-private-1.4.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.3.tgz"; - sha512 = "s5Se3iuiRyznjdO4Qlm1yimNI8NkPl/RRkbc8tC4hoq45KO78CCjU3tKllioTs5DGHtP2kpinseNbyL1zofykA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.4.0.tgz"; + sha512 = "L4HihtweRtlBfBOdjBGjUxhqTG/fEGbNgMcsbvrIJIpwglpziAoYosdXxtY5pMYi0TM8ZcWhDtIB2KXTYsy0+g=="; }; }; - "@ot-builder/ot-glyphs-1.3.3" = { + "@ot-builder/ot-glyphs-1.4.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.3.tgz"; - sha512 = "vqPrWqlfugwsnutphMz2od5VJRvsdnGjBU48rye4tKxRDkOQ+jv9XnrMiEhms0wfBR3G/z0LjNsQAayWIggpDA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.4.0.tgz"; + sha512 = "4ryJxvvX6v3A1g+aQXgpRlbuVQBSCjukxYMfhnWeLadVPM5Q6VKP0Q1VfZcbJFve/A82ltlGRwhresHy/hXiOw=="; }; }; - "@ot-builder/ot-layout-1.3.3" = { + "@ot-builder/ot-layout-1.4.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.3.tgz"; - sha512 = "h0JqUVYvSh77xoGI+PHaXnXOlYKrQCu7EXXDC8uUr2xrnQR4+LJzvt+NPpFwtlG1upc/muCFpDxp6ooQ8crErw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.4.0.tgz"; + sha512 = "DxLQ8jC/dn29pbCy5vKjHhmsLZ4uOJZjiFkSSoi7N4Di+DILiZfIcRJigbJsnqBF3XRUNpgUQs5HvJl65dMjcA=="; }; }; - "@ot-builder/ot-metadata-1.3.3" = { + "@ot-builder/ot-metadata-1.4.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.3.tgz"; - sha512 = "t/D9+MHsSd21laRKtC+M48mCKVODVjcMW8VIZLwA5Vsg9xtAkSSYU/ZXZjmUwahnaJRLAJCovD7B7WkIc8NX7A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.4.0.tgz"; + sha512 = "g64WKXevoJmlN8QyKL+Ew6DwEPNpdoC2Pn/GCBLoyW8KfEzUg/wUCykZu333X+vKSxqiqssLH/aoUOg6uf8BFA=="; }; }; - "@ot-builder/ot-name-1.3.3" = { + "@ot-builder/ot-name-1.4.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.3.tgz"; - sha512 = "g+flff2TZNeN6U4cq9T/JtOTi82NoTjVQrtxsdDTgL7UbfbpyBxloutnFVTdslEUAH2NgSJAeKLdUIuH7LwVjw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.4.0.tgz"; + sha512 = "CGTy3J9P2M03DFcEmR6y4nb3aK6sEaPgXcCR6rXa6gTIxfkVzhpijZzcKUcmzUwh6LYOX3w4RG6Vd9UVOmm+4g=="; }; }; - "@ot-builder/ot-sfnt-1.3.3" = { + "@ot-builder/ot-sfnt-1.4.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.3.tgz"; - sha512 = "reA2LMD5BI/1dsenrgfSmydY18jvu5Lq4p3DmQc/uMaEc5ReW4Vlu0AUoRPoqdhtE00pzwcyc9nuOBXivFl4qg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.4.0.tgz"; + sha512 = "smgt8TMtB+eMpA4mTzB2NwORcv1/+HhFmys2gr8cYorEvqIgRP15kiC7tVC2in2mKYxIq4+e3Z+MciCCdxTXfQ=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.3.3" = { + "@ot-builder/ot-standard-glyph-namer-1.4.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.3.tgz"; - sha512 = "6Ku8YiCVQxT2OwNBnWSrEJO76OtV8LtUCNS+1tdrDJpTzWeZqys0ypnXBLka/aBKUZUkJeXWflaxUNo1r4Tx+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.4.0.tgz"; + sha512 = "dFGkdynJ4sMyPSQkWYJpuNFqAGMXDV4tu0mPevSwrJFudefBmuLIVlOc+rJq19CG+tYq787JJe0CTXIvoq+sNw=="; }; }; - "@ot-builder/ot-vtt-private-1.3.3" = { + "@ot-builder/ot-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.3.tgz"; - sha512 = "T1sdeXE83/IdRz7eRa182bAVYANmnoGiLlO3y/6e0sJSxgMzwr9eSjbf441edvjEMJPbCmBr6gqiJoQMzcIiCg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.4.0.tgz"; + sha512 = "nVg1Y/y3OzqpVz48oM9Ic6YzUJ8UrrT/5iVZMcQ99m5Zon9hcpp/RrYldOF58XuPO0MtgjLME2g4uFUJWSss7Q=="; }; }; - "@ot-builder/prelude-1.3.3" = { + "@ot-builder/prelude-1.4.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.3.tgz"; - sha512 = "GJSZOF13jqvVV4+LREhSo7ZRmikYVGPZl+Z1D4jHUFF7nDqX53KbGMt/tl3rhNMhub0/NTdV8tzdd2LTb/AJDQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.4.0.tgz"; + sha512 = "Q5kqu1DYOeRAcHS15gX1IpoyhR1rffrfKDUcex6nd+GizBPJBdbOtIWpuz7uaOR1zYBCOWuLsyW+h3vKqK0wEw=="; }; }; - "@ot-builder/primitive-1.3.3" = { + "@ot-builder/primitive-1.4.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.3.tgz"; - sha512 = "aEwB2TlorsArhqVQKL9cDyYiszl0wdvhFFgNHp3bmxw7D1w86pFdjAfUO7IyIF7k5JBPswHAzMfmotXcA51lUw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.4.0.tgz"; + sha512 = "Op+KrrhVUkFa7FXqTLbtdTYJbIZA4dHFRB7pE7YqEqfjtYv1tcMKGjQIneXi9kO3yG1T6SDdY9V5UTpIs/rfUQ=="; }; }; - "@ot-builder/rectify-1.3.3" = { + "@ot-builder/rectify-1.4.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.3.tgz"; - sha512 = "Ij9dpqhw0lOos2Z9mr7Z4Li+zQQ1xN9LSUIgfqtHFGVDnC66udYyHahOLMhjhODJVPtA25otADrM4LT/T4jGXQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.4.0.tgz"; + sha512 = "UMhDyFi00B/6Ols0/WJ8aYdNnHadnSTtc3tN97tjnEs0ZS6Tym6SaL044+ehINJA16kazqHqFJMbwLjA/KrFow=="; }; }; - "@ot-builder/stat-glyphs-1.3.3" = { + "@ot-builder/stat-glyphs-1.4.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.3.tgz"; - sha512 = "8vHTL/fhorFp1l2jFSGNT9R9tu0Rr8yQH/vslaOIvY8bBgJDQCqKExmF4lxiGMWMr05mKZhNrwV2vYMHWUP2mA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.4.0.tgz"; + sha512 = "YgMHUivVuXLd+b2TXLHEQDiCjBnmDwDGTfFiGGbaM/XrCdYMzdHNjbpHWhNx4GODcAplkIQm3j3kwFdM4L1wwA=="; }; }; - "@ot-builder/trace-1.3.3" = { + "@ot-builder/trace-1.4.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.3.tgz"; - sha512 = "d4KsjCUgY4tlpfSY74Q2l/k1Fl82ROlt+IQhzl8weSeb/KVGVALltzEIyEmT3Kb5Yh3Clej9nlzzwKWX74dgZw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.4.0.tgz"; + sha512 = "fNt9Nf03I7VuLbeziVA5c1pMx9gr8K92Z7UOUnx387eIjeeOLFY98oVSO+XGXFOd+z5lapR9LWhhhaVlIw+YzA=="; }; }; - "@ot-builder/var-store-1.3.3" = { + "@ot-builder/var-store-1.4.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.3.tgz"; - sha512 = "5LKBIWxB0Oe4QUeRHA3mGaHqlrgA9byeOQNMQxjGDF0fRVDyG40VW1g4xlUQYWzTitM2ML3dP0HlEoVvsTgwwg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.4.0.tgz"; + sha512 = "IGCQqOeLezgGiohkQdsNJGIkyfV7iZVns83K3i+0tBgSaFOZyNLCjy02eHP6u6Z3a5z0NXjT0yalKNaRLLkGnA=="; }; }; - "@ot-builder/variance-1.3.3" = { + "@ot-builder/variance-1.4.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.3.tgz"; - sha512 = "kCd+aqpuF/Go+yHRc0WJ3GP9p1069WQBdG9b5GomQJhYfccGmNOl2P1BUtISAu467DVngc9bBx5ZJbDWn1luXg=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.4.0.tgz"; + sha512 = "TwlAMp8proF7/y3cWP8Vzxq4cbUUB0TzcS9s2vc4L/IGNdFtuIU7RiSO2A4cHoaBMdJSzCDm5CZ1DQopz/607A=="; + }; + }; + "@parcel/bundler-default-2.3.2" = { + name = "_at_parcel_slash_bundler-default"; + packageName = "@parcel/bundler-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.3.2.tgz"; + sha512 = "JUrto4mjSD0ic9dEqRp0loL5o3HVYHja1ZIYSq+rBl2UWRV6/9cGTb07lXOCqqm0BWE+hQ4krUxB76qWaF0Lqw=="; + }; + }; + "@parcel/cache-2.3.2" = { + name = "_at_parcel_slash_cache"; + packageName = "@parcel/cache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.3.2.tgz"; + sha512 = "Xxq+ekgcFEme6Fn1v7rEOBkyMOUOUu7eNqQw0l6HQS+INZ2Q7YzzfdW7pI8rEOAAICVg5BWKpmBQZpgJlT+HxQ=="; + }; + }; + "@parcel/codeframe-2.3.2" = { + name = "_at_parcel_slash_codeframe"; + packageName = "@parcel/codeframe"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.3.2.tgz"; + sha512 = "ireQALcxxrTdIEpzTOoMo/GpfbFm1qlyezeGl3Hce3PMvHLg3a5S6u/Vcy7SAjdld5GfhHEqVY+blME6Z4CyXQ=="; + }; + }; + "@parcel/compressor-raw-2.3.2" = { + name = "_at_parcel_slash_compressor-raw"; + packageName = "@parcel/compressor-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.3.2.tgz"; + sha512 = "8dIoFwinYK6bOTpnZOAwwIv0v73y0ezsctPmfMnIqVQPn7wJwfhw/gbKVcmK5AkgQMkyid98hlLZoaZtGF1Mdg=="; + }; + }; + "@parcel/config-default-2.3.2" = { + name = "_at_parcel_slash_config-default"; + packageName = "@parcel/config-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.3.2.tgz"; + sha512 = "E7/iA7fGCYvXU3u6zF9nxjeDVsgjCN6MVvDjymjaxYMoDWTIsPV245SBEXqzgtmzbMAV+VAl4rVWLMB4pzMt9g=="; + }; + }; + "@parcel/core-2.3.2" = { + name = "_at_parcel_slash_core"; + packageName = "@parcel/core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/core/-/core-2.3.2.tgz"; + sha512 = "gdJzpsgeUhv9H8T0UKVmyuptiXdduEfKIUx0ci+/PGhq8cCoiFnlnuhW6H7oLr79OUc+YJStabDJuG4U2A6ysw=="; + }; + }; + "@parcel/diagnostic-2.3.2" = { + name = "_at_parcel_slash_diagnostic"; + packageName = "@parcel/diagnostic"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.3.2.tgz"; + sha512 = "/xW93Az4AOiifuYW/c4CDbUcu3lx5FcUDAj9AGiR9NSTsF/ROC/RqnxvQ3AGtqa14R7vido4MXEpY3JEp6FsqA=="; + }; + }; + "@parcel/events-2.3.2" = { + name = "_at_parcel_slash_events"; + packageName = "@parcel/events"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/events/-/events-2.3.2.tgz"; + sha512 = "WiYIwXMo4Vd+pi58vRoHkul8TPE5VEfMY+3FYwVCKPl/LYqSD+vz6wMx9uG18mEbB1d/ofefv5ZFQNtPGKO4tQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -6493,6 +6601,42 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; + "@parcel/fs-2.3.2" = { + name = "_at_parcel_slash_fs"; + packageName = "@parcel/fs"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.3.2.tgz"; + sha512 = "XV+OsnRpN01QKU37lBN0TFKvv7uPKfQGbqFqYOrMbXH++Ae8rBU0Ykz+Yu4tv2h7shMlde+AMKgRnRTAJZpWEQ=="; + }; + }; + "@parcel/fs-search-2.3.2" = { + name = "_at_parcel_slash_fs-search"; + packageName = "@parcel/fs-search"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.3.2.tgz"; + sha512 = "u3DTEFnPtKuZvEtgGzfVjQUytegSSn3POi7WfwMwPIaeDPfYcyyhfl+c96z7VL9Gk/pqQ99/cGyAwFdFsnxxXA=="; + }; + }; + "@parcel/graph-2.3.2" = { + name = "_at_parcel_slash_graph"; + packageName = "@parcel/graph"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.3.2.tgz"; + sha512 = "ltTBM3IEqumgmy4ABBFETT8NtAwSsjD9mY3WCyJ5P8rUshfVCg093rvBPbpuJYMaH/TV1AHVaWfZqaZ4JQDIQQ=="; + }; + }; + "@parcel/hash-2.3.2" = { + name = "_at_parcel_slash_hash"; + packageName = "@parcel/hash"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.3.2.tgz"; + sha512 = "SMtYTsHihws/wqdVnOr0QAGyGYsW9rJSJkkoRujUxo8l2ctnBN1ztv89eOUrdtgHsmcnj/oz1yw6sN38X+BUng=="; + }; + }; "@parcel/logger-1.11.1" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; @@ -6502,6 +6646,330 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; + "@parcel/logger-2.3.2" = { + name = "_at_parcel_slash_logger"; + packageName = "@parcel/logger"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.3.2.tgz"; + sha512 = "jIWd8TXDQf+EnNWSa7Q10lSQ6C1LSH8OZkTlaINrfVIw7s+3tVxO3I4pjp7/ARw7RX2gdNPlw6fH4Gn/HvvYbw=="; + }; + }; + "@parcel/markdown-ansi-2.3.2" = { + name = "_at_parcel_slash_markdown-ansi"; + packageName = "@parcel/markdown-ansi"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.3.2.tgz"; + sha512 = "l01ggmag5QScCk9mYA0xHh5TWSffR84uPFP2KvaAMQQ9NLNufcFiU0mn/Mtr3pCb5L5dSzmJ+Oo9s7P1Kh/Fmg=="; + }; + }; + "@parcel/namer-default-2.3.2" = { + name = "_at_parcel_slash_namer-default"; + packageName = "@parcel/namer-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.3.2.tgz"; + sha512 = "3QUMC0+5+3KMKfoAxYAbpZtuRqTgyZKsGDWzOpuqwemqp6P8ahAvNPwSCi6QSkGcTmvtYwBu9/NHPSONxIFOfg=="; + }; + }; + "@parcel/node-resolver-core-2.3.2" = { + name = "_at_parcel_slash_node-resolver-core"; + packageName = "@parcel/node-resolver-core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.3.2.tgz"; + sha512 = "wmrnMNzJN4GuHw2Ftho+BWgSWR6UCkW3XoMdphqcxpw/ieAdS2a+xYSosYkZgQZ6lGutSvLyJ1CkVvP6RLIdQQ=="; + }; + }; + "@parcel/optimizer-cssnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-cssnano"; + packageName = "@parcel/optimizer-cssnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.3.2.tgz"; + sha512 = "wTBOxMiBI38NAB9XIlQZRCjS59+EWjWR9M04D3TWyxl+dL5gYMc1cl4GNynUnmcPdz+3s1UbOdo5/8V90wjiiw=="; + }; + }; + "@parcel/optimizer-htmlnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-htmlnano"; + packageName = "@parcel/optimizer-htmlnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.3.2.tgz"; + sha512 = "U8C0TDSxsx8HmHaLW0Zc7ha1fXQynzhvBjCRMGYnOiLiw0MOfLQxzQ2WKVSeCotmdlF63ayCwxWsd6BuqStiKQ=="; + }; + }; + "@parcel/optimizer-image-2.3.2" = { + name = "_at_parcel_slash_optimizer-image"; + packageName = "@parcel/optimizer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.3.2.tgz"; + sha512 = "HOk3r5qdvY/PmI7Q3i2qEgFH3kP2QWG4Wq3wmC4suaF1+c2gpiQc+HKHWp4QvfbH3jhT00c5NxQyqPhbXeNI9Q=="; + }; + }; + "@parcel/optimizer-svgo-2.3.2" = { + name = "_at_parcel_slash_optimizer-svgo"; + packageName = "@parcel/optimizer-svgo"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.3.2.tgz"; + sha512 = "l7WvZ5+e7D1mVmLUxMVaSb29cviXzuvSY2OpQs0ukdPACDqag+C65hWMzwTiOSSRGPMIu96kQKpeVru2YjibhA=="; + }; + }; + "@parcel/optimizer-terser-2.3.2" = { + name = "_at_parcel_slash_optimizer-terser"; + packageName = "@parcel/optimizer-terser"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.3.2.tgz"; + sha512 = "dOapHhfy0xiNZa2IoEyHGkhhla07xsja79NPem14e5jCqY6Oi40jKNV4ab5uu5u1elWUjJuw69tiYbkDZWbKQw=="; + }; + }; + "@parcel/package-manager-2.3.2" = { + name = "_at_parcel_slash_package-manager"; + packageName = "@parcel/package-manager"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.3.2.tgz"; + sha512 = "pAQfywKVORY8Ee+NHAyKzzQrKbnz8otWRejps7urwhDaTVLfAd5C/1ZV64ATZ9ALYP9jyoQ8bTaxVd4opcSuwg=="; + }; + }; + "@parcel/packager-css-2.3.2" = { + name = "_at_parcel_slash_packager-css"; + packageName = "@parcel/packager-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.3.2.tgz"; + sha512 = "ByuF9xDnQnpVL1Hdu9aY6SpxOuZowd3TH7joh1qdRPLeMHTEvUywHBXoiAyNdrhnLGum8uPEdY8Ra5Xuo1U7kg=="; + }; + }; + "@parcel/packager-html-2.3.2" = { + name = "_at_parcel_slash_packager-html"; + packageName = "@parcel/packager-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.3.2.tgz"; + sha512 = "YqAptdU+uqfgwSii76mRGcA/3TpuC6yHr8xG+11brqj/tEFLsurmX0naombzd7FgmrTE9w+kb0HUIMl2vRBn0A=="; + }; + }; + "@parcel/packager-js-2.3.2" = { + name = "_at_parcel_slash_packager-js"; + packageName = "@parcel/packager-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.3.2.tgz"; + sha512 = "3OP0Ro9M1J+PIKZK4Ec2N5hjIPiqk++B2kMFeiUqvaNZjJgKrPPEICBhjS52rma4IE/NgmIMB3aI5pWqE/KwNA=="; + }; + }; + "@parcel/packager-raw-2.3.2" = { + name = "_at_parcel_slash_packager-raw"; + packageName = "@parcel/packager-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.3.2.tgz"; + sha512 = "RnoZ7WgNAFWkEPrEefvyDqus7xfv9XGprHyTbfLittPaVAZpl+4eAv43nXyMfzk77Cgds6KcNpkosj3acEpNIQ=="; + }; + }; + "@parcel/packager-svg-2.3.2" = { + name = "_at_parcel_slash_packager-svg"; + packageName = "@parcel/packager-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.3.2.tgz"; + sha512 = "iIC0VeczOXynS7M5jCi3naMBRyAznBVJ3iMg92/GaI9duxPlUMGAlHzLAKNtoXkc00HMXDH7rrmMb04VX6FYSg=="; + }; + }; + "@parcel/plugin-2.3.2" = { + name = "_at_parcel_slash_plugin"; + packageName = "@parcel/plugin"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.3.2.tgz"; + sha512 = "SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg=="; + }; + }; + "@parcel/reporter-cli-2.3.2" = { + name = "_at_parcel_slash_reporter-cli"; + packageName = "@parcel/reporter-cli"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.3.2.tgz"; + sha512 = "VYetmTXqW83npsvVvqlQZTbF3yVL3k/FCCl3kSWvOr9LZA0lmyqJWPjMHq37yIIOszQN/p5guLtgCjsP0UQw1Q=="; + }; + }; + "@parcel/reporter-dev-server-2.3.2" = { + name = "_at_parcel_slash_reporter-dev-server"; + packageName = "@parcel/reporter-dev-server"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.3.2.tgz"; + sha512 = "E7LtnjAX4iiWMw2qKUyFBi3+bDz0UGjqgHoPQylUYYLi6opXjJz/oC+cCcCy4e3RZlkrl187XonvagS59YjDxA=="; + }; + }; + "@parcel/resolver-default-2.3.2" = { + name = "_at_parcel_slash_resolver-default"; + packageName = "@parcel/resolver-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.3.2.tgz"; + sha512 = "y3r+xOwWsATrNGUWuZ6soA7q24f8E5tY1AZ9lHCufnkK2cdKZJ5O1cyd7ohkAiKZx2/pMd+FgmVZ/J3oxetXkA=="; + }; + }; + "@parcel/runtime-browser-hmr-2.3.2" = { + name = "_at_parcel_slash_runtime-browser-hmr"; + packageName = "@parcel/runtime-browser-hmr"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.3.2.tgz"; + sha512 = "nRD6uOyF1+HGylP9GASbYmvUDOsDaNwvaxuGTSh8+5M0mmCgib+hVBiPEKbwdmKjGbUPt9wRFPyMa/JpeQZsIQ=="; + }; + }; + "@parcel/runtime-js-2.3.2" = { + name = "_at_parcel_slash_runtime-js"; + packageName = "@parcel/runtime-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.3.2.tgz"; + sha512 = "SJepcHvYO/7CEe/Q85sngk+smcJ6TypuPh4D2R8kN+cAJPi5WvbQEe7+x5BEgbN+5Jumi/Uo3FfOOE5mYh+F6g=="; + }; + }; + "@parcel/runtime-react-refresh-2.3.2" = { + name = "_at_parcel_slash_runtime-react-refresh"; + packageName = "@parcel/runtime-react-refresh"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.3.2.tgz"; + sha512 = "P+GRPO2XVDSBQ4HmRSj2xfbHSQvL9+ahTE/AB74IJExLTITv5l4SHAV3VsiKohuHYUAYHW3A/Oe7tEFCAb6Cug=="; + }; + }; + "@parcel/runtime-service-worker-2.3.2" = { + name = "_at_parcel_slash_runtime-service-worker"; + packageName = "@parcel/runtime-service-worker"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.3.2.tgz"; + sha512 = "iREHj/eapphC4uS/zGUkiTJvG57q+CVbTrfE42kB8ECtf/RYNo5YC9htdvPZjRSXDPrEPc5NCoKp4X09ENNikw=="; + }; + }; + "@parcel/source-map-2.0.2" = { + name = "_at_parcel_slash_source-map"; + packageName = "@parcel/source-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; + sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; + }; + }; + "@parcel/transformer-babel-2.3.2" = { + name = "_at_parcel_slash_transformer-babel"; + packageName = "@parcel/transformer-babel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.3.2.tgz"; + sha512 = "QpWfH2V6jJ+kcUBIMM/uBBG8dGFvNaOGS+8jD6b+eTP+1owzm83RoWgqhRV2D/hhv2qMXEQzIljoc/wg2y+X4g=="; + }; + }; + "@parcel/transformer-css-2.3.2" = { + name = "_at_parcel_slash_transformer-css"; + packageName = "@parcel/transformer-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.3.2.tgz"; + sha512 = "8lzvDny+78DIAqhcXam2Bf9FyaUoqzHdUQdNFn+PuXTHroG/QGPvln1kvqngJjn4/cpJS9vYmAPVXe+nai3P8g=="; + }; + }; + "@parcel/transformer-html-2.3.2" = { + name = "_at_parcel_slash_transformer-html"; + packageName = "@parcel/transformer-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.3.2.tgz"; + sha512 = "idT1I/8WM65IFYBqzRwpwT7sf0xGur4EDQDHhuPX1w+pIVZnh0lkLMAnEqs6ar1SPRMys4chzkuDNnqh0d76hg=="; + }; + }; + "@parcel/transformer-image-2.3.2" = { + name = "_at_parcel_slash_transformer-image"; + packageName = "@parcel/transformer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.3.2.tgz"; + sha512 = "0K7cJHXysli6hZsUz/zVGO7WCoaaIeVdzAxKpLA1Yl3LKw/ODiMyXKt08LiV/ljQ2xT5qb9EsXUWDRvcZ0b96A=="; + }; + }; + "@parcel/transformer-js-2.3.2" = { + name = "_at_parcel_slash_transformer-js"; + packageName = "@parcel/transformer-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.3.2.tgz"; + sha512 = "U1fbIoAoqR5P49S+DMhH8BUd9IHRPwrTTv6ARYGsYnhuNsjTFhNYE0kkfRYboe/e0z7vEbeJICZXjnZ7eQDw5A=="; + }; + }; + "@parcel/transformer-json-2.3.2" = { + name = "_at_parcel_slash_transformer-json"; + packageName = "@parcel/transformer-json"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.3.2.tgz"; + sha512 = "Pv2iPaxKINtFwOk5fDbHjQlSm2Vza/NLimQY896FLxiXPNAJxWGvMwdutgOPEBKksxRx9LZPyIOHiRVZ0KcA3w=="; + }; + }; + "@parcel/transformer-postcss-2.3.2" = { + name = "_at_parcel_slash_transformer-postcss"; + packageName = "@parcel/transformer-postcss"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz"; + sha512 = "Rpdxc1rt2aJFCh/y/ccaBc9J1crDjNY5o44xYoOemBoUNDMREsmg5sR5iO81qKKO5GxfoosGb2zh59aeTmywcg=="; + }; + }; + "@parcel/transformer-posthtml-2.3.2" = { + name = "_at_parcel_slash_transformer-posthtml"; + packageName = "@parcel/transformer-posthtml"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.3.2.tgz"; + sha512 = "tMdVExfdM+1G8A9KSHDsjg+S9xEGbhH5mApF2NslPnNZ4ciLKRNuHU2sSV/v8i0a6kacKvDTrwQXYBQJGOodBw=="; + }; + }; + "@parcel/transformer-raw-2.3.2" = { + name = "_at_parcel_slash_transformer-raw"; + packageName = "@parcel/transformer-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.3.2.tgz"; + sha512 = "lY7eOCaALZ90+GH+4PZRmAPGQRXoZ66NakSdhEtH6JSSAYOmZKDvNLGTMRo/vK1oELzWMuAHGdqvbcPDtNLLVw=="; + }; + }; + "@parcel/transformer-react-refresh-wrap-2.3.2" = { + name = "_at_parcel_slash_transformer-react-refresh-wrap"; + packageName = "@parcel/transformer-react-refresh-wrap"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.3.2.tgz"; + sha512 = "FZaderyCExn0SBZ6D+zHPWc8JSn9YDcbfibv0wkCl+D7sYfeWZ22i7MRp5NwCe/TZ21WuxDWySCggEp/Waz2xg=="; + }; + }; + "@parcel/transformer-svg-2.3.2" = { + name = "_at_parcel_slash_transformer-svg"; + packageName = "@parcel/transformer-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz"; + sha512 = "k9My6bePsaGgUh+tidDjFbbVgKPTzwCAQfoloZRMt7y396KgUbvCfqDruk04k6k+cJn7Jl1o/5lUpTEruBze7g=="; + }; + }; + "@parcel/types-2.3.2" = { + name = "_at_parcel_slash_types"; + packageName = "@parcel/types"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/types/-/types-2.3.2.tgz"; + sha512 = "C77Ct1xNM7LWjPTfe/dQ/9rq1efdsX5VJu2o8/TVi6qoFh64Wp/c5/vCHwKInOTBZUTchVO6z4PGJNIZoUVJuA=="; + }; + }; "@parcel/utils-1.11.0" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; @@ -6511,6 +6979,15 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; + "@parcel/utils-2.3.2" = { + name = "_at_parcel_slash_utils"; + packageName = "@parcel/utils"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.3.2.tgz"; + sha512 = "xzZ+0vWhrXlLzGoz7WlANaO5IPtyWGeCZruGtepUL3yheRWb1UU4zFN9xz7Z+j++Dmf1Fgkc3qdk/t4O8u9HLQ=="; + }; + }; "@parcel/watcher-1.12.1" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; @@ -6520,6 +6997,15 @@ let sha512 = "od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA=="; }; }; + "@parcel/watcher-2.0.5" = { + name = "_at_parcel_slash_watcher"; + packageName = "@parcel/watcher"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; + sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; + }; + }; "@parcel/workers-1.11.0" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; @@ -6529,6 +7015,15 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@parcel/workers-2.3.2" = { + name = "_at_parcel_slash_workers"; + packageName = "@parcel/workers"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.3.2.tgz"; + sha512 = "JbOm+Ceuyymd1SuKGgodC2EXAiPuFRpaNUSJpz3NAsS3lVIt2TDAPMOWBivS7sML/KltspUfl/Q9YwO0TPUFNw=="; + }; + }; "@pm2/agent-2.0.1" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -6574,22 +7069,22 @@ let sha512 = "J3IlK0Ok88RQZVB//af7Lnl1Vw2buyyr5G3oEvK1wRSYTJi/E/HBm5JZUihmDAtm/unr85FC534DwA5e+4LR2w=="; }; }; - "@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "qM+uJbkelB21bnK44gYE049YTHIjHysOuj0mj5U2gDGyNLfmiazlggzFPCgEjgme4U5YB2tYs6Z5Hq08Kl8pjA=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "LjRssaWu9w2SrXitofnutRIyURI7l0veQYIALz7uY4shygM9nMcK3omXcObRm7TAcw3Z+9ytfK1B+ySOsOesxQ=="; }; }; - "@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "D+1BlYjBpj3mUGrB/druJ1St43jmldcTqSZ1RIOOnB15r+ZtteMJk0PrhVGEVPHCK2Qmbz2PG0/gNooTJHwSAQ=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "f0Srf2EasvBRKBlTUrqkW5hp889+SRrRkqu0MgcuTXlgHxVMj7DIo1JNylPb1y/HDwtjLWf6AL+sk+2R891SWA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6700,13 +7195,13 @@ let sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; }; }; - "@putdotio/api-client-8.27.3" = { + "@putdotio/api-client-8.29.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.27.3"; + version = "8.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.27.3.tgz"; - sha512 = "i50+y+OTfqKdgE5QwrXDqzfQZKtpLqPYf6pr2u/xTTRS8/w8/nrWmE7N1Hh6WpTBa68XidgUBzqSjit7PYOyfA=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.29.0.tgz"; + sha512 = "zx1WB5OBDy7Qox4lWQdEvubQd5lMCfuJdR+unx7vnPN1bv3DYMV00+KsAeZpN+O4DVCIReTl8q3D55w6AKsYzw=="; }; }; "@reach/router-1.3.4" = { @@ -6763,13 +7258,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.82" = { + "@redocly/openapi-core-1.0.0-beta.85" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.82"; + version = "1.0.0-beta.85"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.82.tgz"; - sha512 = "bJ0WclpgkFv4aa5QWU83ARCv3VQJy9U94reb1chOTg9s2bsTHbYuUwRv6G370a7lFXX86AyB3dT5IzS6GytLlA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.85.tgz"; + sha512 = "46ilsZ9g+tE5aWdNIKCUc9o6kcYM8nh5oKOlt9scawGR+spv1SfiYrvjtrcjLP5WyX082AUFBdnmzzScxs49Og=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6826,13 +7321,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.2.4" = { + "@schematics/angular-13.2.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.2.4"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.4.tgz"; - sha512 = "pAVuPmFklWVpNJkARs4aGYM5Mo4iez0eW0dDY+ugxZlt1KOLJQDmMK2Go60iEAQLlOw2pKO/jcmTttOP8PN0UQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.5.tgz"; + sha512 = "pUaTwyMZRy7laV9RQozREomiUKi7Tn4wdyyuCUSqVvaiLI+DKvWE4vJXA2+/ketfzRjx6xIaCEexjsHJ+2FNtg=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -6853,13 +7348,22 @@ let sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@serverless/dashboard-plugin-6.1.0" = { + "@serverless/aws-lambda-otel-extension-dist-0.1.6" = { + name = "_at_serverless_slash_aws-lambda-otel-extension-dist"; + packageName = "@serverless/aws-lambda-otel-extension-dist"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/aws-lambda-otel-extension-dist/-/aws-lambda-otel-extension-dist-0.1.6.tgz"; + sha512 = "Xt1bVZvDYKp01kXo8z0/8yd5rHeq1SxOmP4ZsdoASNXVlliR/wo4W/Pt4eJk5/zklA6CjWN4PfhcRkt90XKqtw=="; + }; + }; + "@serverless/dashboard-plugin-6.1.5" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.1.0"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.0.tgz"; - sha512 = "rbIWKRoqTIMl0ZOt6f0VIaEj+6slV18iEkW7tIBOKq6eQTkX2tHvBgVXrTh3ZKFNnMePGn4rtfbwB5G9oZ0Wig=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.5.tgz"; + sha512 = "RpZysQyCKzrtY4rJpK1qiQdambt2NrRYqlV9IEsGf5LaQu6f7G35VZrPoS6A2jD8Rt3nMK7t+0LOO5zfVmBMLA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -6871,22 +7375,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.3.1" = { + "@serverless/platform-client-4.3.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.1.tgz"; - sha512 = "VPXeTTgXmWZtZmbzm9eh5FJcOoFgHkcwgfNA59FV3TE2Vcm5JZiXKtXl5AANu9LYcyOtJK7iBJXs8OUSwNbJZw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.2.tgz"; + sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.0.2" = { + "@serverless/utils-6.0.3" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.2.tgz"; - sha512 = "4vNv6nt4/w8wX79DN7OujR/Ih1wlJ9ZJnY28BtF69ehFwlGqnxlF2CXVGo3W7Xh4maK3hWnoc+L4akQX6nH+3g=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.3.tgz"; + sha512 = "6oKLqAkK6CG2zjAs2rfuHEOLoK11K/oep5bwGTEb5JmFP/92JQtvyb+FxP4DknL4jYpiYj1Dd5sCt5auHhOASg=="; }; }; "@sideway/address-4.1.3" = { @@ -6970,13 +7474,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.4.0" = { + "@sindresorhus/is-4.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz"; - sha512 = "QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; "@sindresorhus/jimp-0.3.0" = { @@ -7150,6 +7654,15 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; + "@swc/helpers-0.2.14" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.14.tgz"; + sha512 = "wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -7168,13 +7681,13 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@textlint/ast-node-types-12.1.0" = { + "@textlint/ast-node-types-12.1.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.0.tgz"; - sha512 = "UlxqemrV/EnGTCl26OU7JhtFJpH7NZdgXvnsuII604orcIkvywUA1GGlg51grfbfqi+ar4zRsOb6fVbcbMZnKA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz"; + sha512 = "5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -7186,67 +7699,67 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.1.0" = { + "@textlint/ast-tester-12.1.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.0.tgz"; - sha512 = "s3VHRDaULFYhxjJ3vP9LUIt2aHLnUB4XFUSRhUVnW4/GDOb1EXCGWFd+wtYy6jTtBg/5TR5ApdC6sNu/SLcb5w=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.1.tgz"; + sha512 = "lPbpp9qZ/Me852OzWWOSwqbYa9clziRRRfX6qeRqJOuuc8qNOzvP2vC7quvQPSNcGpnDse2bNwePgxtWhWb5fQ=="; }; }; - "@textlint/ast-traverse-12.1.0" = { + "@textlint/ast-traverse-12.1.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.0.tgz"; - sha512 = "NJCCMS7lxZ6Ed15zsosbe/5i/SyynqQsxOYxhsMHuyU/adx27WzNWLoFbgTdz6Wmn3Ok1PSFf0442MpoS6SP7g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.1.tgz"; + sha512 = "/hiESq9fwR+4X4U7VfkjhUtuIRuJwnJZpgA+WiSpIwK4Ps60WhB1VBxecyxgNmj3s3EsJn95nCCJntgpa3qQcA=="; }; }; - "@textlint/feature-flag-12.1.0" = { + "@textlint/feature-flag-12.1.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.0.tgz"; - sha512 = "pQfA2bUXimBQjxT5hVmGGuFf1Cwwx26kbrcwkGHsgxgXlXkg1zboby5UCMOjWda/TbJjynzqDO0JaU24Ms9fZg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.1.tgz"; + sha512 = "NykyIJ7UCs3R1tjThAS6upScmZdia0N/prOT7j1HpMbn1QK61Kqz7M3KZb0T/nhko6jwfN0d3aNP3oMCb4Vyxg=="; }; }; - "@textlint/fixer-formatter-12.1.0" = { + "@textlint/fixer-formatter-12.1.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.0.tgz"; - sha512 = "ELG9ehkid+J0sRd0mVRbZ+2UOnLqowycrYsaHxDE+xf2s33OcogZa9i3Uact7y2oSCadX00oNLEhsQcwkAqvpw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.1.tgz"; + sha512 = "9+f3WG1raKqY+ynS1JS/ESLNgUaKK1gIgK9ENESvrJA0zfg5I774LjjJ65catrorTdv+HHDG40aiD67Pmxdk9A=="; }; }; - "@textlint/kernel-12.1.0" = { + "@textlint/kernel-12.1.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.0.tgz"; - sha512 = "6crFn0Ng4Y8PnUvD8HdGMZUlxURx3YgbDv/Grp+7kg8qLlNAkvbyJ1cE8ZYJTF+PfJ1dK1FZmmlZsvrieI4KBQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.1.tgz"; + sha512 = "5f/miUMLBLUhBy0sJeLVs+34O3GaYyG7hAuTQG9p0ERUnXdJIGtoYU5O0Sfm+xWXPUOeQadK6E7IR+7fsX4Hhw=="; }; }; - "@textlint/linter-formatter-12.1.0" = { + "@textlint/linter-formatter-12.1.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.0.tgz"; - sha512 = "OoDvn7wD+pAV+W2loCKgxO9V11rYo14GVKkp8UktsqzeOzxxRY5iZUOALMOOde19fOklb2mEvs8AJ4lDaRDJVQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.1.tgz"; + sha512 = "yE4g+OA+jVqEpF5NayuFoH4l3vvXPT3+gGD9TYhkjBUGmIZ0n4sMzOtmb9R+McujvENwk+7jTZ0pfHtZtpVSHQ=="; }; }; - "@textlint/markdown-to-ast-12.1.0" = { + "@textlint/markdown-to-ast-12.1.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.0.tgz"; - sha512 = "22FRiXRxTrNVe1gbE18V8TxAtrWb9rKUb1+2mt5vXdgByZ+rHUJuEc4UonAiye/8+0eTrJ4brjPNXgYsJGeMKg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz"; + sha512 = "TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw=="; }; }; "@textlint/markdown-to-ast-6.1.7" = { @@ -7258,67 +7771,67 @@ let sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; - "@textlint/module-interop-12.1.0" = { + "@textlint/module-interop-12.1.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.0.tgz"; - sha512 = "J1VhFZ7lK1V3Ue7DCvZlGIFEuaongBCkir1XFL+f1yfhfQlgfM5TCp3OBBB6NhKPff8T6sPA9niBzMYr+NyKyA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.1.tgz"; + sha512 = "SiF2NVMFny7OdZ3I+qclJXkuPLOylJVd+v3mPGF8Ri5yuDgOKrbqNyHFzz/Sn2AS0ZsIf04/pGNBQhB+fJOBRQ=="; }; }; - "@textlint/source-code-fixer-12.1.0" = { + "@textlint/source-code-fixer-12.1.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.0.tgz"; - sha512 = "3HEWCu8XlRpxK0UmUxGEzc4u0deaO0GtisqaEsCVHzlQFq6tzE+5VTdZ4ffon64UN8UV57EAC2ralEV/VgxkBQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.1.tgz"; + sha512 = "+p7NE5W2Ie+a5dSXGG0onDrqQM9Quj9t9zQruqxN3Qm7F8JD3qBTx9XNZkzQKlnGtrN4x6FUp5wwH/X4BhHh1A=="; }; }; - "@textlint/text-to-ast-12.1.0" = { + "@textlint/text-to-ast-12.1.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.0.tgz"; - sha512 = "s45+d0E9+gMKz+LC9+sJamU7SVrPyGYsXVLDRM5oxqjdb0MeIfjIFj7xl52MUpAHnywbPSgakB6HHiryiEAmqQ=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.1.tgz"; + sha512 = "L+Wf6omQ9u/A+H8kr8Dv1bKQ7j5TeBJX7ShdZz+z0T3oOPDrpCHID6N/NbzuM+a1Q9s9UAG5gkqiROHNjXqUug=="; }; }; - "@textlint/textlint-plugin-markdown-12.1.0" = { + "@textlint/textlint-plugin-markdown-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.0.tgz"; - sha512 = "bS67fq4Ea2JdKO4mJM4sGSATVI1bw9++IfOIsx2rc01NfZlTxwz4kM8lrhvNFHGY4URaN1kCULSgupeI/u/Seg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.1.tgz"; + sha512 = "gzQ205ClqECTblIdkpFkWL6M4nxr5oMON/jU6xbRdZ/Shy+OHLY7fP3R2L2RmAmMSE7C6ZWK5Lk7k9XaaUpgVA=="; }; }; - "@textlint/textlint-plugin-text-12.1.0" = { + "@textlint/textlint-plugin-text-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.0.tgz"; - sha512 = "ItqpVEYLDYQkEk0ixeD4wElqkgkDErAGGDN/QK4cmIvtBeVd/GSIQFS1pwC1/Abmd4dTK3j/9z/dov1gVFZB1Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.1.tgz"; + sha512 = "U3WFM2fPy0ifC9lVW0GXjF5h1Dquit3rLO6UisC9UF75Ic6JjelcypjHwpp1trx0/t5FXp+94R5uJEpM360A0g=="; }; }; - "@textlint/types-12.1.0" = { + "@textlint/types-12.1.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.0.tgz"; - sha512 = "O8RQUiGnBvBrwV/fLHp2vU+y3w223G+qKUzvW/k2eFwAdbtmCfordoKESXAIGuqAUZjgiM2+Mt3We1pY+tMR3g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.1.tgz"; + sha512 = "s0TjnEwEwp3fa8yEhEH8w/lFpih15wtQy2CYaKx0eMScl1bSh+0e8WhiGZaTiiJXAGwNCw6erxB0reBScdU/hA=="; }; }; - "@textlint/utils-12.1.0" = { + "@textlint/utils-12.1.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.0.tgz"; - sha512 = "WE0bxQ/q+PgSslqEBuDi4Z8ZskBA0ZEehmKqcsd0hpDWU4VRU/R9o/WVXwia0APbQxgXPYWaHf1Rb7FAKUcVcg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.1.tgz"; + sha512 = "ENAm6ro+OAh6XZZSeZIJQCrY07IHWB7DGM6SwtKEfxcA9joF1uS/sLPqKmcW9fyvLvMnloVUsfVlaoNsLJXDKA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -8068,13 +8581,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.13" = { + "@types/jquery-3.5.14" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz"; - sha512 = "ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz"; + sha512 = "X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -8194,13 +8707,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.178" = { + "@types/lodash-4.14.179" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.178"; + version = "4.14.179"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; - sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; + sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; }; }; "@types/long-4.0.1" = { @@ -8455,13 +8968,13 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.25" = { + "@types/node-16.11.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.25"; + version = "16.11.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz"; - sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; + sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; "@types/node-16.11.7" = { @@ -8473,15 +8986,6 @@ let sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; }; }; - "@types/node-17.0.10" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; - }; - }; "@types/node-17.0.14" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8500,15 +9004,6 @@ let sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.16" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.16.tgz"; - sha512 = "ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA=="; - }; - }; "@types/node-17.0.17" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8527,13 +9022,13 @@ let sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="; }; }; - "@types/node-17.0.8" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.8"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz"; - sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; "@types/node-6.14.13" = { @@ -8689,13 +9184,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.2.0" = { + "@types/rc-1.2.1" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; - sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.1.tgz"; + sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; "@types/react-16.14.23" = { @@ -9094,13 +9589,13 @@ let sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg=="; }; }; - "@types/ws-8.2.3" = { + "@types/ws-8.5.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.2.3"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.3.tgz"; - sha512 = "ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz"; + sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw=="; }; }; "@types/yargs-15.0.14" = { @@ -9283,13 +9778,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.2.1" = { - name = "_at_unicode_slash_unicode-13.0.0"; - packageName = "@unicode/unicode-13.0.0"; + "@unicode/unicode-14.0.0-1.2.1" = { + name = "_at_unicode_slash_unicode-14.0.0"; + packageName = "@unicode/unicode-14.0.0"; version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.1.tgz"; - sha512 = "8NDE4zZASktxJe+hV13K795wefyx+wRhu3Wl7TJ8fzsKx95CHsgTFmYRTscqna90zpUz6YBjGyqXHBI2ubiMaw=="; + url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.1.tgz"; + sha512 = "M7NfPQP0PsCRFIUnmtFMgMiC5CCB26YwURCWIE48RQKbtN61sXrDhuXNq9w/tkBOtVeU84IAB1MMK9c+d2iR7A=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -10210,13 +10705,13 @@ let sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; }; }; - "@xstate/fsm-1.6.4" = { + "@xstate/fsm-1.6.5" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.4.tgz"; - sha512 = "JvoozDB1ndz+byxXsQYW150gAJQIAKZt8MfU2a4dqGhhxfvHBKNj5e1rqb+adVCLtB+F/McyUBe4jRauFhTCTQ=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; + sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -10354,6 +10849,15 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; + "abortcontroller-polyfill-1.7.3" = { + name = "abortcontroller-polyfill"; + packageName = "abortcontroller-polyfill"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; + }; + }; "abstract-extension-3.1.1" = { name = "abstract-extension"; packageName = "abstract-extension"; @@ -10768,13 +11272,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.0" = { + "agentkeepalive-4.2.1" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; - sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; }; "aggregate-error-3.1.0" = { @@ -13063,13 +13567,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1077.0" = { + "aws-sdk-2.1084.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1077.0"; + version = "2.1084.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz"; - sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1084.0.tgz"; + sha512 = "fhMjPRrrln8LhMZw17IyrzkVXCG6okFMrZzgIZN1h63WWGot65qcIvYfUn7YyHpYWMLBeND8MRfW6x6PIqJBdA=="; }; }; "aws-sdk-2.920.0" = { @@ -13171,13 +13675,13 @@ let sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; - "azure-devops-node-api-11.1.0" = { + "azure-devops-node-api-11.1.1" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; - version = "11.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz"; - sha512 = "6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q=="; + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.1.tgz"; + sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; "b24.js-1.0.3" = { @@ -13486,13 +13990,13 @@ let sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; - "babel-plugin-styled-components-2.0.3" = { + "babel-plugin-styled-components-2.0.6" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.3.tgz"; - sha512 = "lMrl3GdPrTl9daQJ70eRCPM9fHlvQx6YJNM7RqojKGbRnvG2AL7qvURlZ3L0GzRGnGr19SjvBKWcnlZZkgQ8/Q=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz"; + sha512 = "Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -16916,31 +17420,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.20" = { + "cdk8s-1.5.30" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.20"; + version = "1.5.30"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.20.tgz"; - sha512 = "SBcX7mUsv9LbYr1zyrYcqJu+FoAELgQ1Jgi9dikNT21DVYyorIeZ/0uJYzfjzBmr6jSZOaswdzZ9keT8KFYnuA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.30.tgz"; + sha512 = "r/ak37mCxHzpKiOkiHe9Jqolk2aRGqB7pBNDGu/xAE608iuBRy6BGP6NG/KppOnJI8m2NLSbJQvJYjuWE7yDEQ=="; }; }; - "cdk8s-plus-22-1.0.0-beta.121" = { + "cdk8s-plus-22-1.0.0-beta.131" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.121"; + version = "1.0.0-beta.131"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.121.tgz"; - sha512 = "9Yda0m3MVrlPbANO4kvaJoDNCbV5PQj9/umK58qrfEuEDg1KONj/DvqeZ8dNr0Gk3Qp0h2z84T0YYHlBZDtEDA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.131.tgz"; + sha512 = "HQWeXSsxXoeMb7YYyWx5vuxKa6GWfB1XeRJtArP9zDVeE2wgFypKwngPZMCC9m2bze31mWWPnSI2QLWBNAxR/Q=="; }; }; - "cdktf-0.9.1" = { + "cdktf-0.9.4" = { name = "cdktf"; packageName = "cdktf"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.1.tgz"; - sha512 = "GOt29nXb2eM7DoqnErp98m1j4crPcplhK+kjb5ACF2hHXSgK4VWNNIxoYLDZBB/FtPJRXDLWwuI7mugBi0vncQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.4.tgz"; + sha512 = "CuTCNVV3Goptnq3daPVfs9boODEoIrjy09XAj9nkApcozgidPkNIkDcaJCo/7q3rxnoblsK9u2nj6CDUB8cTIg=="; }; }; "center-align-0.1.3" = { @@ -17681,6 +18185,15 @@ let sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; }; }; + "clarify-error-1.0.0" = { + name = "clarify-error"; + packageName = "clarify-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarify-error/-/clarify-error-1.0.0.tgz"; + sha512 = "f96oT3/Cdwz1eB+7RaH/XRR42lwGqVPnDl9NAm9ugT+BwAFoUS/pVnkgXUo/5UaUmwMMs6/GNFP8A8gCgmgvog=="; + }; + }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -19571,22 +20084,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.66" = { + "constructs-10.0.76" = { name = "constructs"; packageName = "constructs"; - version = "10.0.66"; + version = "10.0.76"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.66.tgz"; - sha512 = "luFprSllFDm8iEt/irxsWnm8PHNKNNnZ3pV+5PRXDUOnLaWCv6Vwm+7E0IX6pfgiSphOSsWqhA4ReJA+xe0YHg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.76.tgz"; + sha512 = "588WcQJS/g1pFUHH/bhSbpo6US0rgn+FTWL3PKRw0PNDTKNOZjXRrsaXIBsvVmE60Iy6kkwL9FuovSjK/qNE/Q=="; }; }; - "constructs-3.3.221" = { + "constructs-3.3.231" = { name = "constructs"; packageName = "constructs"; - version = "3.3.221"; + version = "3.3.231"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.221.tgz"; - sha512 = "+mFPYjtEWakgB3Ao7s+FDzuSHkrIiF+aUP7O9flMa+jkxQVkoW7txl4TUrOSi94FbFJoh0fVT3P37xOa1P/8+Q=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.231.tgz"; + sha512 = "NCntsRwmx0DWyFTMmGmB/7V90oqEBwH/7r/qcZ0vX2a1twI3U/rcNpqsKy9N3KDZ4XqI6+XyUgTv2o4nK1uYTw=="; }; }; "consume-http-header-1.0.0" = { @@ -20301,13 +20814,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-1.0.5" = { + "cosmiconfig-typescript-loader-1.0.6" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.5.tgz"; - sha512 = "FL/YR1nb8hyN0bAcP3MBaIoZravfZtVsN/RuPnoo6UVjqIrDxSNIpXHCGgJe0ZWy5yImpyD6jq5wCJ5f1nUv8g=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.6.tgz"; + sha512 = "2nEotziYJWtNtoTjKbchj9QrdTT6DBxCvqjNKoDKARw+e2yZmTQCa07uRrykLIZuvSgp69YXLH89UHc0WhdMfQ=="; }; }; "couch-login-0.1.20" = { @@ -20328,13 +20841,13 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-7.0.0" = { + "cp-file-9.1.0" = { name = "cp-file"; packageName = "cp-file"; - version = "7.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz"; - sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz"; + sha512 = "3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA=="; }; }; "cpu-percentage-1.0.3" = { @@ -20355,13 +20868,13 @@ let sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA=="; }; }; - "cpy-8.1.2" = { + "cpy-9.0.0" = { name = "cpy"; packageName = "cpy"; - version = "8.1.2"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz"; - sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg=="; + url = "https://registry.npmjs.org/cpy/-/cpy-9.0.0.tgz"; + sha512 = "+yJuWIPnwcdBx+vBcZkb1jeAu05TZlPTAXdZf/fMrksyPQf2tTQr3/zpm1CeBJxeS3E9t4X0HQnr+CMsKSDIXA=="; }; }; "crc-0.2.0" = { @@ -20436,13 +20949,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.7.0" = { + "create-gatsby-2.9.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.7.0.tgz"; - sha512 = "Le7r71ycNiPLq6RrOKXeONsotC57viwuajFuVfhAzXAgUmJSraHSeHT8S4Ydoa3nML1SyJiZaPB4CLC+Ju3gPQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.9.0.tgz"; + sha512 = "xl4bMKm4Buz4btVcU8FenspTJQdegv/4G2z7REKsTempdUWAU6wh8nyKlMWGNUJV2K8oQ6oGLXSJbL4a0LTglQ=="; }; }; "create-graphback-1.0.1" = { @@ -20625,13 +21138,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.24" = { + "cross-undici-fetch-0.1.25" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.24"; + version = "0.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.24.tgz"; - sha512 = "83KDV6+8pYCn51zSM2cFAwqQ5UQtDaPm89RkUwHxEMDq/cdqYgqo1q+2eM/Xhmd8HeAsGTtecsC4crrQkCn0zg=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.25.tgz"; + sha512 = "KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw=="; }; }; "crossroads-0.12.2" = { @@ -20814,6 +21327,15 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; + "css-declaration-sorter-6.1.4" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha512 = "lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw=="; + }; + }; "css-functions-list-3.0.1" = { name = "css-functions-list"; packageName = "css-functions-list"; @@ -21030,6 +21552,15 @@ let sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; + "cssnano-5.1.0" = { + name = "cssnano"; + packageName = "cssnano"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.0.tgz"; + sha512 = "wWxave1wMlThGg4ueK98jFKaNqXnQd1nVZpSkQ9XvR+YymlzP1ofWqES1JkHtI250LksP9z5JH+oDcrKDJezAg=="; + }; + }; "cssnano-preset-default-4.0.8" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; @@ -21039,6 +21570,15 @@ let sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; + "cssnano-preset-default-5.2.0" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.0.tgz"; + sha512 = "3N5Vcptj2pqVKpHVqH6ezOJvqikR2PdLTbTrsrhF61FbLRQuujAqZ2sKN5rvcMsb7hFjrNnjZT8CGEkxoN/Pwg=="; + }; + }; "cssnano-util-get-arguments-4.0.0" = { name = "cssnano-util-get-arguments"; packageName = "cssnano-util-get-arguments"; @@ -21075,6 +21615,15 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; + "cssnano-utils-3.1.0" = { + name = "cssnano-utils"; + packageName = "cssnano-utils"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; + sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; + }; + }; "csso-2.0.0" = { name = "csso"; packageName = "csso"; @@ -22443,13 +22992,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.10.7" = { + "dayjs-1.10.8" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz"; + sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; }; }; "dayjs-1.8.36" = { @@ -23478,13 +24027,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "destroy-1.1.0" = { + "destroy-1.1.1" = { name = "destroy"; packageName = "destroy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz"; - sha512 = "R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ=="; + url = "https://registry.npmjs.org/destroy/-/destroy-1.1.1.tgz"; + sha512 = "jxwFW+yrVOLdwqIWvowFOM8UPdhZnvOF6mhXQQLXMxBDLtv2JVJlVJPEwkDv9prqscEtGtmnxuuI6pQKStK1vA=="; }; }; "detab-1.0.2" = { @@ -24378,6 +24927,15 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; + "dotenv-7.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz"; + sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24846,13 +25404,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.71" = { + "electron-to-chromium-1.4.75" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.71"; + version = "1.4.75"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz"; - sha512 = "Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz"; + sha512 = "LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25199,13 +25757,13 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; - "engine.io-6.1.2" = { + "engine.io-6.1.3" = { name = "engine.io"; packageName = "engine.io"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz"; - sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz"; + sha512 = "rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA=="; }; }; "engine.io-client-1.3.1" = { @@ -25307,13 +25865,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.9.0" = { + "enhanced-resolve-5.9.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz"; - sha512 = "weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.1.tgz"; + sha512 = "jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw=="; }; }; "enquirer-2.3.6" = { @@ -25388,6 +25946,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-3.0.1" = { + name = "entities"; + packageName = "entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -27557,13 +28124,13 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-redact-3.1.0" = { + "fast-redact-3.1.1" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.0.tgz"; - sha512 = "dir8LOnvialLxiXDPESMDHGp82CHi6ZEYTVkcvdn5d7psdv9ZkkButXrOeXST4aqreIRR+N7CYlsrwFuorurVg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.1.tgz"; + sha512 = "odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -29177,6 +29744,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-10.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + }; + }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -29519,22 +30095,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.7.0" = { + "gatsby-core-utils-3.9.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.7.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.7.0.tgz"; - sha512 = "CboIzpEFbaD4+WrozKl3fMpxUetcaDq0aWPfrfzAtc8l0JMlD3GS2Q/uW7HpcvTAlSGv2ZomTzd2ySLV/AgpTQ=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.9.0.tgz"; + sha512 = "SvPnr86oXTY3ldbQ4QAkEew3BQE9vlzUXcXVJqTOhMUeGEz2kibBFUmVp8ia9Y1eOD+K/0xXQ54jUqaResj69w=="; }; }; - "gatsby-telemetry-3.7.0" = { + "gatsby-telemetry-3.9.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.7.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.7.0.tgz"; - sha512 = "jhtUGZynyHM3r9a7po/rKffj5AjacmU0rqqarsee9dxlDqsamqRtyFPTjn7JubRrc958M6qzNW+z/Zi0hoeFHg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.9.0.tgz"; + sha512 = "ifqJ4KS16mbpfZ5oVaU4WEbk6gccivVqjCbzfVGgqtl+C8B0u1CeShvr4NcJE1FdVFYIOB4uJeV9Wym03B075A=="; }; }; "gauge-1.2.7" = { @@ -29564,13 +30140,13 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gauge-4.0.1" = { + "gauge-4.0.2" = { name = "gauge"; packageName = "gauge"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.1.tgz"; - sha512 = "zJ4jePUHR8cceduZ53b6temRalyGpkC2Kc2r3ecNphmL+uWNoJ3YcOcUjpbG6WwoE/Ef6/+aEZz63neI2WIa1Q=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.2.tgz"; + sha512 = "aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA=="; }; }; "gaxios-2.3.4" = { @@ -29789,6 +30365,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-port-4.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; + sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; + }; + }; "get-port-5.1.1" = { name = "get-port"; packageName = "get-port"; @@ -30717,13 +31302,13 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "google-auth-library-7.13.0" = { + "google-auth-library-7.14.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.13.0.tgz"; - sha512 = "6Q2/ZijxVKt9I6TgljUa4oMiRvQcul0lm3g6faEvWHZ9ql9gOmlAJPAmV/BKQ/GiMFtD2llF6codS350d0GjlQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.0.tgz"; + sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30762,13 +31347,13 @@ let sha512 = "l/TFSW7IRFcb7wF641BlmuP8Ox1ncuzJk5Fcs2947otlGBm5ktDxFhPkmrcNDaG+LWPQsuDwP1ojL0xV39cpmw=="; }; }; - "googleapis-common-5.0.5" = { + "googleapis-common-5.1.0" = { name = "googleapis-common"; packageName = "googleapis-common"; - version = "5.0.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.0.5.tgz"; - sha512 = "o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw=="; + url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; }; }; "goosig-0.10.0" = { @@ -30978,13 +31563,13 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.23.2" = { + "graphology-0.24.1" = { name = "graphology"; packageName = "graphology"; - version = "0.23.2"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.23.2.tgz"; - sha512 = "RHcLpAP4M+KPShLQEvgkT1Y4vxl+FFbmmy3D0mupO+VXIuYC8zdmMcHs40D9m3mmN067zGS+lUaHjDq06Td7PQ=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.24.1.tgz"; + sha512 = "6lNz1PNTAe9Q6ioHKrXu0Lp047sgvOoHa4qmP/8mnJWCGv2iIZPQkuHPUb2/OWDWCqHpw2hKgJLJ55X/66xmHg=="; }; }; "graphology-types-0.21.2" = { @@ -31194,13 +31779,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.5.5" = { + "graphql-ws-5.6.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.5.5"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz"; - sha512 = "hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.2.tgz"; + sha512 = "TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ=="; }; }; "gray-matter-4.0.3" = { @@ -31635,15 +32220,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-glob-1.0.0" = { - name = "has-glob"; - packageName = "has-glob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz"; - sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207"; - }; - }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -31680,13 +32256,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -32598,6 +33174,15 @@ let sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg=="; }; }; + "htmlnano-2.0.0" = { + name = "htmlnano"; + packageName = "htmlnano"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; + sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; + }; + }; "htmlparser2-3.10.1" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -32643,6 +33228,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "htmlparser2-7.2.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + }; "http-assert-1.5.0" = { name = "http-assert"; packageName = "http-assert"; @@ -32742,6 +33336,15 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -33228,13 +33831,13 @@ let sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; }; }; - "hypertrie-5.1.2" = { + "hypertrie-5.1.3" = { name = "hypertrie"; packageName = "hypertrie"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.2.tgz"; - sha512 = "kdzigFUWrCX5NTFvi28q5o3P7faP3QliAQpMfKRSrP5jtitqPfhTgXwstcxS+Vj7mP93R+unZlPYiwu6N9whzA=="; + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.3.tgz"; + sha512 = "UllKwlFn6Vh268Y0LCD5isvDeCeaaNm9mJC4OFCcb5imv6nyBf/aHirJwUTOm9u01v6GZCXmCI9kKZnpNkm6nA=="; }; }; "i-0.3.7" = { @@ -33597,6 +34200,15 @@ let sha512 = "CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ=="; }; }; + "import-from-4.0.0" = { + name = "import-from"; + packageName = "import-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz"; + sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -35253,6 +35865,15 @@ let sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; }; }; + "is-json-2.0.1" = { + name = "is-json"; + packageName = "is-json"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; + sha1 = "6be166d144828a131d686891b983df62c39491ff"; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -35289,13 +35910,13 @@ let sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; }; }; - "is-my-ip-valid-1.0.0" = { + "is-my-ip-valid-1.0.1" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz"; + sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg=="; }; }; "is-my-json-valid-2.20.6" = { @@ -35991,13 +36612,13 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; - "is-valid-domain-0.1.5" = { + "is-valid-domain-0.1.6" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.5.tgz"; - sha512 = "ilzfGo1kXzoVpSLplJWOexoiuAc6mRK+vPlNAeEPVJ29RagETpCz0izg6CZfY72DCuA+PCrEAEJeaecRLMNq5Q=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.6.tgz"; + sha512 = "ZKtq737eFkZr71At8NxOFcP9O1K89gW3DkdrGMpp1upr/ueWjj+Weh4l9AI4rN0Gt8W2M1w7jrG2b/Yv83Ljpg=="; }; }; "is-valid-glob-1.0.0" = { @@ -36712,13 +37333,13 @@ let sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; - "jquery.terminal-2.31.1" = { + "jquery.terminal-2.32.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.31.1"; + version = "2.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.31.1.tgz"; - sha512 = "JVCL3mOmE+NQ1SvwHyRtJ18ICEylHoLqh0mmi0HResjeE7v/85rREfoLDtYfJxDxCNpTrznGl3HEoUCfjHnycA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.0.tgz"; + sha512 = "Q+eYaAQikguSx5UHVs/r7Y/C1/jzEEZS40DGAhHmga8MQZdk9Z+dstfN/U4IcNnm1nXPer8A6CKMBdTPLrROkg=="; }; }; "js-base64-2.6.3" = { @@ -37081,13 +37702,13 @@ let sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA=="; }; }; - "jsii-srcmak-0.1.480" = { + "jsii-srcmak-0.1.490" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.480"; + version = "0.1.490"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.480.tgz"; - sha512 = "dfbPFhBAWAm+y7c1Sqwmzav8ZsSaxSt9bGAV5oeYztYBVY+4wlgpspY6mtVF6K6IWN4PKsK/6rcJvaMRe2cFtQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.490.tgz"; + sha512 = "29Evf978EDQOMawRlDPMGqLBNGUrT9MSTUYnsG3xhjWj9Kqt/aRjy7V8tpaPkDFMQHgZ2bUYBrOpxkVFME/BgQ=="; }; }; "json-bigint-1.0.0" = { @@ -37315,6 +37936,15 @@ let sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; }; }; + "json-source-map-0.6.1" = { + name = "json-source-map"; + packageName = "json-source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz"; + sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -37378,13 +38008,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.140" = { + "json2jsii-0.2.150" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.140"; + version = "0.2.150"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.140.tgz"; - sha512 = "AM7hYuy6DQUZlrLVIGK2kOe2Xi8dBjd0QFzgUVCLOxeTngfXcR/SSwcbl7m/ChDn0iSj0gPpKzKu29CyZQq5Hw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.150.tgz"; + sha512 = "8vyDj+rUeL2vuSWGc6PBe/DcN60xf7HQD5muJ7NFtPDrVGh7V1MwKvyJyvfpgcieZ9kPVs7w5obvU5wPDBe9CA=="; }; }; "json3-3.2.6" = { @@ -37747,6 +38377,15 @@ let sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; }; }; + "junk-4.0.0" = { + name = "junk"; + packageName = "junk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-4.0.0.tgz"; + sha512 = "ojtSU++zLJ3jQG9bAYjg94w+/DOJtRyD7nPaerMFrBhmdVmiV5/exYH5t4uHga4G/95nT6hr1OJoKIFbYbrW5w=="; + }; + }; "just-debounce-1.1.0" = { name = "just-debounce"; packageName = "just-debounce"; @@ -38872,24 +39511,6 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; - "lightning-5.3.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.3.tgz"; - sha512 = "/piN0cPoXe3wfKJxIwlclOEC3es0VhqFFKpPw5Z1AahpDs1UA/0+czaDiwUrwWPYnlM/6gh92Tu4iXDYNWipng=="; - }; - }; - "lightning-5.3.4" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.4.tgz"; - sha512 = "zUHlFFSS+KJhndoZkjkXPWpvlXAgYGWS2SxzXpiiwnXZKCNmT+IkQFQmp2oIpbF7K93oqlpxgafZMZDeReX5pQ=="; - }; - }; "lightning-5.6.1" = { name = "lightning"; packageName = "lightning"; @@ -38908,15 +39529,6 @@ let sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog=="; }; }; - "lightning-5.6.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.6.3.tgz"; - sha512 = "esDBNfA2FoLiQrrOmAYrrjMfO7qz624m3X81aLODgqV4pNAIxEmXYD1fiDg3EBdAD1h07xoGna+xKT2oYDAuUw=="; - }; - }; "lightning-5.7.1" = { name = "lightning"; packageName = "lightning"; @@ -39115,6 +39727,15 @@ let sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ=="; }; }; + "lmdb-2.2.3" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.3.tgz"; + sha512 = "+OiHQpw22mBBxocb/9vcVNETqf0k5vgHA2r+KX7eCf8j5tSV50ZIv388iY1mnnrERIUhs2sjKQbZhPg7z4HyPQ=="; + }; + }; "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -39133,24 +39754,6 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-53.5.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.0.tgz"; - sha512 = "W6x/uM0K1hHEMadW4YvXcucUc2hjIm+jMIxs0ujNaeRH6uVFEtlfPmEwnYV9EzU3Ns+NOp/juuN/fvF0DqeXhQ=="; - }; - }; - "ln-service-53.5.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.1.tgz"; - sha512 = "EXLhYeu1qvhk+yzuH6qBZyGvqBPWT71FnmsbOxKjWofW6SGQBbJuNru6Ub2NIMhJnXqD7qvMvswZ54ho/oPvGQ=="; - }; - }; "ln-service-53.7.2" = { name = "ln-service"; packageName = "ln-service"; @@ -39169,15 +39772,6 @@ let sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw=="; }; }; - "ln-service-53.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.8.0.tgz"; - sha512 = "W7HReWocdZLSiQaVHvbzFvzEVyftnBuqcm8joEpxLnSpTU6qhJCuIVwEyLYKqhgDKWx2rn5rOnrZ0xKua8j6TQ=="; - }; - }; "ln-service-53.8.1" = { name = "ln-service"; packageName = "ln-service"; @@ -39187,22 +39781,13 @@ let sha512 = "yEKEsDRsPQyBNzS7kpEaYCIhsxSsQzpf+ABov44RvbDKJONf4qMZOiy+IkqhqLP5IwlHFuLdnz/aHCLMSYtuqA=="; }; }; - "ln-service-53.9.1" = { + "ln-service-53.9.2" = { name = "ln-service"; packageName = "ln-service"; - version = "53.9.1"; + version = "53.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.1.tgz"; - sha512 = "0s0auOxItb5xFKA5yzAU+0eXKFLyWCbv9BrFnqxRrAIXY7wJYT8jFSL609BuFqwmUYkSdsIwe8EYr9WgPohWgQ=="; - }; - }; - "ln-sync-3.10.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.10.0.tgz"; - sha512 = "iRYFVwHF6gyBKO8/WJfR+6jlsjPSsevFz/cbOQbOwBzMVaCmXIyWw95SGHEJLcZR2jNadEfP3k10oYa+hWou3A=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.2.tgz"; + sha512 = "ISbIBxbRIBKDPDFuWj3pINZXFRAmHTTeEWdeq7pXJxeFH8JlnrwS8ETSJ1AfgHeeUIHK1D4xo3TNAnkSrRpH/A=="; }; }; "ln-sync-3.10.1" = { @@ -39214,22 +39799,13 @@ let sha512 = "mib9y2c36Gz6oQ7sUzAmLV3a8wt52Rm1zKo7ldxBN49Tnh0gGQXbM69jOhLsy7DbB2TCjUJEh1d8OGMsbGuBqg=="; }; }; - "ln-sync-3.7.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.7.0.tgz"; - sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; - }; - }; - "ln-telegram-3.17.3" = { + "ln-telegram-3.19.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.17.3"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.17.3.tgz"; - sha512 = "zGapeGsiRaK308l1gSyz0Cq9xU/S4jf0leFwxI5jwlAjgNGYzRpakk3f8mJETw6uxw+Cgn1kdl4dcnCC8SjyUg=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.19.1.tgz"; + sha512 = "PvSVXwMK5XCL5DpXlAGRvhUJxn1seLsteLEpL/+iS9N3XdpB288kSOH0dBUWznoVbzJgQbykf1p3Rskx7acctg=="; }; }; "load-bmfont-1.4.1" = { @@ -41113,13 +41689,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.3.1" = { + "lru-cache-7.4.0" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.3.1.tgz"; - sha512 = "nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.0.tgz"; + sha512 = "YOfuyWa/Ee+PXbDm40j9WXyJrzQUynVbgn4Km643UYcWNcrSfRkKL0WaiUcxcIbkXcVTgNpDqSnPXntWXT75cw=="; }; }; "lru-queue-0.1.0" = { @@ -41195,13 +41771,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.3.0" = { + "luxon-2.3.1" = { name = "luxon"; packageName = "luxon"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.0.tgz"; - sha512 = "gv6jZCV+gGIrVKhO90yrsn8qXPKD8HYZJtrUDSfEbow8Tkw84T9OnCyJhWvnJIaIF/tBuiAjZuQHUt1LddX2mg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; }; }; "lzma-native-8.0.6" = { @@ -42599,15 +43175,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.1" = { - name = "meow"; - packageName = "meow"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; - sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; - }; - }; "meow-7.1.1" = { name = "meow"; packageName = "meow"; @@ -42725,6 +43292,15 @@ let sha512 = "E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ=="; }; }; + "meros-1.2.0" = { + name = "meros"; + packageName = "meros"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meros/-/meros-1.2.0.tgz"; + sha512 = "3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ=="; + }; + }; "metals-languageclient-0.4.2" = { name = "metals-languageclient"; packageName = "metals-languageclient"; @@ -43400,6 +43976,15 @@ let sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; + "mime-db-1.52.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -43625,13 +44210,13 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.0.0" = { + "minimatch-5.0.1" = { name = "minimatch"; packageName = "minimatch"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.0.tgz"; - sha512 = "EU+GCVjXD00yOUf1TwAHVP7v3fBD3A8RkkPYsWWKGWesxM/572sL53wJQnHxquHlRhYUV36wHkqrN8cdikKc2g=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz"; + sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; }; }; "minimist-0.0.10" = { @@ -43958,13 +44543,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.4.1" = { + "mobx-6.4.2" = { name = "mobx"; packageName = "mobx"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.4.1.tgz"; - sha512 = "NFXx0uMbGBgsa0uxhH099L8cMuoRQWh01q6Sf0ZX/3hFU7svJ7yfTD+1LnLMa5wzY/b7gImAeMsR1p0wordDnA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.4.2.tgz"; + sha512 = "b4xQJYiH8sb0sEbfq/Ws3N77DEJtSihUFD1moeiz2jNoJ5B+mqJutt54ouO9iEfkp7Wk4jQDsVUOh7DPEW3wEw=="; }; }; "mobx-react-7.3.0" = { @@ -44345,6 +44930,24 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; + "msgpackr-1.5.4" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.4.tgz"; + sha512 = "Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA=="; + }; + }; + "msgpackr-extract-1.0.16" = { + name = "msgpackr-extract"; + packageName = "msgpackr-extract"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; + sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; + }; + }; "multer-1.4.2" = { name = "multer"; packageName = "multer"; @@ -44390,13 +44993,13 @@ let sha512 = "+vZLrxhuAJFOl9EFUkFviYpz8nIOdoM3Hzq8Mzx0uJkaRWd61QxIp68wglTM8ZtABXYgE0YowD98XqthCRxSow=="; }; }; - "multiblob-http-1.2.0" = { + "multiblob-http-1.2.1" = { name = "multiblob-http"; packageName = "multiblob-http"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.0.tgz"; - sha512 = "bTW9D4NcgvWO/vFXakTUV5JN7p2fTG0o4Flg2zZFF44fDBUnq4FkZKbFNnkci+zkdfYAo9HqZPxvnMwS58mtjQ=="; + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.1.tgz"; + sha512 = "ZNgfHZkC1A1xec7aUE7Tq6ArIXE7pygzbf3jNX1wlK15STqenGGURrqM79puk3j2cscC9Keu/ULQM3dET3xLCQ=="; }; }; "multicast-dns-4.0.1" = { @@ -44642,13 +45245,13 @@ let sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; - "muxrpc-6.7.0" = { + "muxrpc-6.7.2" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.0.tgz"; - sha512 = "1jdziESUd2ajBUJ/tvLRdm9TJQiN+JuN0NHtvubposhVUi8T5PF6ODfit6lg30l4iDxK4/z52wvbnHbsfvzT/w=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.2.tgz"; + sha512 = "tmaQl2h6OB4ofvOex/DQpKOiMOktnRAe9bvBmYCd9BnE3QmwOSpZey2n7P5gWlKDTRgjunJZiISlGOKIOXbHZg=="; }; }; "muxrpc-usage-2.1.0" = { @@ -45228,13 +45831,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "nel-1.2.0" = { + "nel-1.3.0" = { name = "nel"; packageName = "nel"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nel/-/nel-1.2.0.tgz"; - sha512 = "yt96hdYomrZC5ZvYHMCsRF5KIaZ8Aue5Gff4sH+6GmPDMJft097x5JG1DicLnfgSYE56CLP6ztZEfb+3St91Yw=="; + url = "https://registry.npmjs.org/nel/-/nel-1.3.0.tgz"; + sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; "neo-async-2.6.2" = { @@ -45750,13 +46353,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-3.2.0" = { + "node-fetch-3.2.1" = { name = "node-fetch"; packageName = "node-fetch"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz"; - sha512 = "8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.1.tgz"; + sha512 = "Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA=="; }; }; "node-fetch-h2-2.3.0" = { @@ -46857,13 +47460,13 @@ let sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; }; - "number-allocator-1.0.9" = { + "number-allocator-1.0.10" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; - sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz"; + sha512 = "K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw=="; }; }; "number-is-nan-1.0.1" = { @@ -47407,6 +48010,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -47713,13 +48325,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.2.0" = { + "openapi-sampler-1.2.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.0.tgz"; - sha512 = "Y0tFg2iH7NWnNHYnesxhMfkXc7wWXyJXYMUTTxkGkfpl0U9u/ZOf6BxrdEXBD4sgs9uMlVWsbWLDLesVmSUU7Q=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.1.tgz"; + sha512 = "mHrYmyvcLD0qrfqPkPRBAL2z16hGT2rW0d0B7nklfoTcc3pmkJLkSZlKSeFgerUM41E5c7jlxf0Y19xrM7mWQQ=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -48082,13 +48694,22 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "ora-6.0.1" = { + "ora-6.1.0" = { name = "ora"; packageName = "ora"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz"; - sha512 = "TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g=="; + url = "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz"; + sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; + }; + }; + "ordered-binary-1.2.4" = { + name = "ordered-binary"; + packageName = "ordered-binary"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; + sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; }; }; "ordered-read-streams-1.0.1" = { @@ -48217,22 +48838,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.3.3" = { + "ot-builder-1.4.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.3.tgz"; - sha512 = "MRagUwE9VN5++ptJXPd5RqK6YbDUe6i+I7RWRpsgo2aD2ZbvktfoJ1FJGzLbaRucsWw4X3d6xKf8xIQ5SnjMJA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.4.0.tgz"; + sha512 = "aNXKQr0+ztCBcb0VF7RtNJ2rcUq7jaJWr7PHs47gWVME5O+e+H/pBPh54LFBi9nm17LZGBo/gH+ETiDuMcZj8Q=="; }; }; - "otb-ttc-bundle-1.3.3" = { + "otb-ttc-bundle-1.4.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.3.tgz"; - sha512 = "Aezn4zk5RFET7R7KONsKRvspOBpdJvVqTg6t2NZ6/sIpCeiwSIe3nUtOpn+PGvM11zMq7x3ulhWFrWdNRO9A/g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.4.0.tgz"; + sha512 = "gZ/8LxA+YTovx/ZcU/iz9vpzpV1PSClDaWLd5ELn2amCLASMy0Icp2CNPateIwl1Z2O2pW9TTCC0Uu/0OsnKgA=="; }; }; "ow-0.21.0" = { @@ -48244,15 +48865,6 @@ let sha512 = "dlsoDe39g7mhdsdrC1R/YwjT7yjVqE3svWwOlMGvN690waBkgEZBmKBdkmKvSt5/wZ6E0Jn/nIesPqMZOpPKqw=="; }; }; - "p-all-2.1.0" = { - name = "p-all"; - packageName = "p-all"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz"; - sha512 = "HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA=="; - }; - }; "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; @@ -48352,13 +48964,13 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; - "p-filter-2.1.0" = { + "p-filter-3.0.0" = { name = "p-filter"; packageName = "p-filter"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz"; - sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; + url = "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz"; + sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; "p-finally-1.0.0" = { @@ -48874,13 +49486,13 @@ let sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; - "pacote-13.0.2" = { + "pacote-13.0.3" = { name = "pacote"; packageName = "pacote"; - version = "13.0.2"; + version = "13.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.0.2.tgz"; - sha512 = "3LyfvDk2BSJNFQZIcDqnLNa7IsYb6KwX3H9uZPwaHJFIX6Gv5N9QHU+s7mEs/RbN4/ta6KUT39LAi2l6EkBi5A=="; + url = "https://registry.npmjs.org/pacote/-/pacote-13.0.3.tgz"; + sha512 = "8thQ06YoO01O1k5rvSpHS/XPJZucw2DPiiT1jI+ys8QaTN6ifAyxfyoABHBa8nIt/4wPdzly4GEPqshctHFoYA=="; }; }; "pad-0.0.5" = { @@ -48901,22 +49513,13 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.11.0" = { + "paid-services-3.12.1" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.0.tgz"; - sha512 = "G0Enb7xcOpZlOmoK7h7Anym0nFG+t7JPMoTie5HoeUfwfm/mtNfUXyJvtom930Dg9l/g/rVk5CbivwzSS8ccUw=="; - }; - }; - "paid-services-3.11.4" = { - name = "paid-services"; - packageName = "paid-services"; - version = "3.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.4.tgz"; - sha512 = "f31e2RMh6LiLs+P+k1r/ZsN9SDTD4U3KmEtk2IMMAsUADjb9U9KkFA9fHmMBmVZyjsLDVa4CDKWY93OiNJ1n1A=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.1.tgz"; + sha512 = "byws4+Ap+z8n/lLoZ8miW0WqaYkH/3DMmggdPmfrbYLLmSGkJEBYDnUMICX6941h1/j5KN6EC7l/MTSKaWg7/g=="; }; }; "pako-0.2.9" = { @@ -49630,13 +50233,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.35.1" = { + "patel-0.37.1" = { name = "patel"; packageName = "patel"; - version = "0.35.1"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.35.1.tgz"; - sha512 = "Em5Zh8t+oVnTNELwze1J9iQEeOBC+84B+UstU4hrmv16uvdunBzmMad6kY28nVxBxycqH6EYsDV2s1rO9IeZaw=="; + url = "https://registry.npmjs.org/patel/-/patel-0.37.1.tgz"; + sha512 = "7lIe3whu1gIJePlt8U+xmKCNXZgfBNNYdE4thvJTKfz8xZmmHC3+Oc7pI2qabtVLppXAjg5g3xnhDaLsD7dQ8w=="; }; }; "path-browserify-0.0.1" = { @@ -49882,13 +50485,13 @@ let sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; - "patrisika-0.23.0" = { + "patrisika-0.24.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.23.0.tgz"; - sha512 = "bGxKK+XqO7Qfgv7WJSeytwZlbQsKXeuya+FD+6CB0iHat4tSbmN6eT0FEWGf0ulNguD0th/H3fa+VuXDDYQmLw=="; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.24.0.tgz"; + sha512 = "vIXRwNNZic/jMtMGCmWG0+b3vg2zKqeNgY4NHKHkevUc+eIY7iudIXMGwnDY45mavfHxmEhATxnpkMJvBwCCqA=="; }; }; "patrisika-scopes-0.12.0" = { @@ -50792,6 +51395,15 @@ let sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; }; + "postcss-8.4.7" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz"; + sha512 = "L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -50801,6 +51413,15 @@ let sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; }; }; + "postcss-calc-8.2.4" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; + sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; + }; + }; "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; @@ -50810,6 +51431,15 @@ let sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; + "postcss-colormin-5.3.0" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; + sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; + }; + }; "postcss-convert-values-4.0.1" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; @@ -50819,6 +51449,15 @@ let sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; + "postcss-convert-values-5.1.0" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz"; + sha512 = "GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g=="; + }; + }; "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; @@ -50828,6 +51467,15 @@ let sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; + "postcss-discard-comments-5.1.0" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz"; + sha512 = "L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg=="; + }; + }; "postcss-discard-duplicates-4.0.2" = { name = "postcss-discard-duplicates"; packageName = "postcss-discard-duplicates"; @@ -50837,6 +51485,15 @@ let sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; + "postcss-discard-duplicates-5.1.0" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; + sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; + }; + }; "postcss-discard-empty-4.0.1" = { name = "postcss-discard-empty"; packageName = "postcss-discard-empty"; @@ -50846,6 +51503,15 @@ let sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; + "postcss-discard-empty-5.1.0" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz"; + sha512 = "782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA=="; + }; + }; "postcss-discard-overridden-4.0.1" = { name = "postcss-discard-overridden"; packageName = "postcss-discard-overridden"; @@ -50855,6 +51521,15 @@ let sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; + "postcss-discard-overridden-5.1.0" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; + sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; + }; + }; "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; @@ -50936,6 +51611,15 @@ let sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; + "postcss-merge-longhand-5.1.0" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.0.tgz"; + sha512 = "Gr46srN2tsLD8fudKYoHO56RG0BLQ2nsBRnSZGY04eNBPwTeWa9KeHrbL3tOLAHyB2aliikycPH2TMJG1U+W6g=="; + }; + }; "postcss-merge-rules-4.0.3" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; @@ -50945,6 +51629,15 @@ let sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; + "postcss-merge-rules-5.1.0" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz"; + sha512 = "NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ=="; + }; + }; "postcss-minify-font-values-4.0.2" = { name = "postcss-minify-font-values"; packageName = "postcss-minify-font-values"; @@ -50954,6 +51647,15 @@ let sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; + "postcss-minify-font-values-5.1.0" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; + sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; + }; + }; "postcss-minify-gradients-4.0.2" = { name = "postcss-minify-gradients"; packageName = "postcss-minify-gradients"; @@ -50963,6 +51665,15 @@ let sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; + "postcss-minify-gradients-5.1.0" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz"; + sha512 = "J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg=="; + }; + }; "postcss-minify-params-4.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; @@ -50972,6 +51683,15 @@ let sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; + "postcss-minify-params-5.1.0" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.0.tgz"; + sha512 = "q67dcts4Hct6x8+JmhBgctHkbvUsqGIg2IItenjE63iZXMbhjr7AlVZkNnKtIGt/1Wsv7p/7YzeSII6Q+KPXRg=="; + }; + }; "postcss-minify-selectors-4.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; @@ -50981,6 +51701,15 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; + "postcss-minify-selectors-5.2.0" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz"; + sha512 = "vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -51089,6 +51818,15 @@ let sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; + "postcss-normalize-charset-5.1.0" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; + sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; + }; + }; "postcss-normalize-display-values-4.0.2" = { name = "postcss-normalize-display-values"; packageName = "postcss-normalize-display-values"; @@ -51098,6 +51836,15 @@ let sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; + "postcss-normalize-display-values-5.1.0" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; + sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; + }; + }; "postcss-normalize-positions-4.0.2" = { name = "postcss-normalize-positions"; packageName = "postcss-normalize-positions"; @@ -51107,6 +51854,15 @@ let sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; + "postcss-normalize-positions-5.1.0" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz"; + sha512 = "8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ=="; + }; + }; "postcss-normalize-repeat-style-4.0.2" = { name = "postcss-normalize-repeat-style"; packageName = "postcss-normalize-repeat-style"; @@ -51116,6 +51872,15 @@ let sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; + "postcss-normalize-repeat-style-5.1.0" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz"; + sha512 = "IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw=="; + }; + }; "postcss-normalize-string-4.0.2" = { name = "postcss-normalize-string"; packageName = "postcss-normalize-string"; @@ -51125,6 +51890,15 @@ let sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; + "postcss-normalize-string-5.1.0" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; + sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; + }; + }; "postcss-normalize-timing-functions-4.0.2" = { name = "postcss-normalize-timing-functions"; packageName = "postcss-normalize-timing-functions"; @@ -51134,6 +51908,15 @@ let sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; + "postcss-normalize-timing-functions-5.1.0" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; + sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; + }; + }; "postcss-normalize-unicode-4.0.1" = { name = "postcss-normalize-unicode"; packageName = "postcss-normalize-unicode"; @@ -51143,6 +51926,15 @@ let sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; + "postcss-normalize-unicode-5.1.0" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; + sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; + }; + }; "postcss-normalize-url-4.0.1" = { name = "postcss-normalize-url"; packageName = "postcss-normalize-url"; @@ -51152,6 +51944,15 @@ let sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; + "postcss-normalize-url-5.1.0" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; + sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; + }; + }; "postcss-normalize-whitespace-4.0.2" = { name = "postcss-normalize-whitespace"; packageName = "postcss-normalize-whitespace"; @@ -51161,6 +51962,15 @@ let sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; + "postcss-normalize-whitespace-5.1.0" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.0.tgz"; + sha512 = "7O1FanKaJkpWFyCghFzIkLhehujV/frGkdofGLwhg5upbLyGsSfiTcZAdSzoPsSUgyPCkBkNMeWR8yVgPdQybg=="; + }; + }; "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; @@ -51170,6 +51980,15 @@ let sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; + "postcss-ordered-values-5.1.0" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz"; + sha512 = "wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA=="; + }; + }; "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; @@ -51179,6 +51998,15 @@ let sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; + "postcss-reduce-initial-5.1.0" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; + sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; + }; + }; "postcss-reduce-transforms-4.0.2" = { name = "postcss-reduce-transforms"; packageName = "postcss-reduce-transforms"; @@ -51188,6 +52016,15 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; + "postcss-reduce-transforms-5.1.0" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; + sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; + }; + }; "postcss-reporter-7.0.5" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -51278,6 +52115,15 @@ let sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; }; }; + "postcss-svgo-5.1.0" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; + sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; + }; + }; "postcss-syntax-0.36.2" = { name = "postcss-syntax"; packageName = "postcss-syntax"; @@ -51296,6 +52142,15 @@ let sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; + "postcss-unique-selectors-5.1.0" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.0.tgz"; + sha512 = "LmUhgGobtpeVJJHuogzjLRwJlN7VH+BL5c9GKMVJSS/ejoyePZkXvNsYUtk//F6vKOGK86gfRS0xH7fXQSDtvA=="; + }; + }; "postcss-value-parser-3.3.1" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; @@ -51368,6 +52223,33 @@ let sha512 = "YugEJ5ze/0DLRIVBjCpDwANWL4pPj1kHJ/2llY8xuInr0nbkon3qTiMPe5LQa+cCwNjxS7nAZZTp+1M+6mT4Zg=="; }; }; + "posthtml-0.16.6" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; + sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; + }; + }; + "posthtml-parser-0.10.2" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; + sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; + }; + }; + "posthtml-parser-0.11.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; + sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; + }; + }; "posthtml-parser-0.4.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; @@ -51395,6 +52277,15 @@ let sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; + "posthtml-render-3.0.0" = { + name = "posthtml-render"; + packageName = "posthtml-render"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; + sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; + }; + }; "potpack-1.0.2" = { name = "potpack"; packageName = "potpack"; @@ -52871,13 +53762,13 @@ let sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; }; }; - "pull-abortable-4.0.0" = { + "pull-abortable-4.1.1" = { name = "pull-abortable"; packageName = "pull-abortable"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; - sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; }; }; "pull-async-1.0.0" = { @@ -53087,13 +53978,13 @@ let sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; }; }; - "pull-goodbye-0.0.2" = { + "pull-goodbye-0.0.3" = { name = "pull-goodbye"; packageName = "pull-goodbye"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; - sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.3.tgz"; + sha512 = "fl3RcIHKsxFaygdU3dcwSznLr73HYGOEU9IshpiatYSV+PW3TOUEjtfdu1L8uIsUoDajJz3HM/+mG0mFD4+v5A=="; }; }; "pull-handshake-1.1.4" = { @@ -53132,13 +54023,13 @@ let sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; }; }; - "pull-inactivity-2.1.3" = { + "pull-inactivity-2.1.4" = { name = "pull-inactivity"; packageName = "pull-inactivity"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz"; - sha512 = "swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA=="; + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.4.tgz"; + sha512 = "W2Q+6Jk0oRMICYXBXom3/ipz2U5YPUSQUfLvVgUqL/daHop7QQB3Jz5XpnnxsekCPoM61lGvXc7kFDZt0uWzMg=="; }; }; "pull-kvdiff-0.0.0" = { @@ -53321,15 +54212,6 @@ let sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; }; }; - "pull-stream-3.5.0" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; - sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; - }; - }; "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; @@ -53537,13 +54419,13 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.3.2" = { + "puppeteer-13.4.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.3.2"; + version = "13.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.3.2.tgz"; - sha512 = "TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.4.1.tgz"; + sha512 = "2arcYPEGvLV9HvOw01Zv1b1IAXrMWHqsFJn0Hn00qe9HtCmaF0b8FlrbdLjCIbkaFc6icH5+GqcG8R5KxlJSRg=="; }; }; "purest-3.1.0" = { @@ -53600,13 +54482,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.222" = { + "pyright-1.1.226" = { name = "pyright"; packageName = "pyright"; - version = "1.1.222"; + version = "1.1.226"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.222.tgz"; - sha512 = "zEQyvkQa/hUmjg5A7COOzE/uL3W6D/Fp6qjhE+HDeLKwe+zm1KSMo74djIn0CTzhK53bmEDgEIR1hoMpA/Is/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.226.tgz"; + sha512 = "ZJx3Kz5v7hc6DIeIVSC3zeCia43rlLD+IK8ip5k+h3gTlIQodaf/zccsCh2xmoBvCTY9VbbbLnDbkITyIW3+MA=="; }; }; "q-0.9.7" = { @@ -54338,6 +55220,15 @@ let sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; + "raw-body-2.5.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -54419,13 +55310,13 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; - "re2-1.17.3" = { + "re2-1.17.4" = { name = "re2"; packageName = "re2"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.17.3.tgz"; - sha512 = "Dp5iWVR8W3C7Nm9DziMY4BleMPRb/pe6kvfbzLv80dVYaXRc9jRnwwNqU0oE/taRm0qYR1+Qrtzk9rPjS9ecaQ=="; + url = "https://registry.npmjs.org/re2/-/re2-1.17.4.tgz"; + sha512 = "xyZ4h5PqE8I9tAxTh3G0UttcK5ufrcUxReFjGzfX61vtanNbS1XZHjnwRSyPcLgChI4KLxVgOT/ioZXnUAdoTA=="; }; }; "reachdown-1.1.0" = { @@ -54590,6 +55481,15 @@ let sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; }; }; + "react-refresh-0.9.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"; + sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; + }; + }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -55292,13 +56192,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.63" = { + "redoc-2.0.0-rc.64" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.63"; + version = "2.0.0-rc.64"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.63.tgz"; - sha512 = "PsoPqRyNqHi7+jKUyFBwJhHrzjMl4N5vieTeBloRGbhWuY3PPH2DJ3ihgrLfdEV0glzq/LMTaqfarm8WLqCc4Q=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.64.tgz"; + sha512 = "zrM/vcONpbmyDUOpk7Ai7R/yZrT7W1+8ANJUB3b5kzaLQUx4VbrDoT4D6HHHquOnKx+5We4nOPPAi8fi/cqa8g=="; }; }; "reduce-component-1.0.1" = { @@ -57893,13 +58793,13 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.49.8" = { + "sass-1.49.9" = { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.49.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; }; "sax-0.5.8" = { @@ -58082,13 +58982,22 @@ let sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; }; }; - "secret-stack-6.4.0" = { + "secret-handshake-1.1.21" = { + name = "secret-handshake"; + packageName = "secret-handshake"; + version = "1.1.21"; + src = fetchurl { + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.21.tgz"; + sha512 = "e02+IddZv40tNJmaRZNZ6aYje95h9MvmpmbOg2PVjLKRA5p9QnrQypJlVE2dU516TyYc9jikBjqhXV1IlkwNUw=="; + }; + }; + "secret-stack-6.4.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.0.tgz"; - sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.1.tgz"; + sha512 = "7rRcTEj7t0H3ShMKQvv7QGYAUFjVRmDqNNgrvpdedVlVnEIyfkZu0RaFPpes6yUSiE9Iwi0lHi03+6HsltLCMA=="; }; }; "secretstream-stream-2.0.0" = { @@ -59837,13 +60746,13 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "sockjs-client-1.5.2" = { + "sockjs-client-1.6.0" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; - sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz"; + sha512 = "qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ=="; }; }; "socks-2.6.2" = { @@ -60746,31 +61655,31 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-bendy-butt-0.12.4" = { + "ssb-bendy-butt-0.12.5" = { name = "ssb-bendy-butt"; packageName = "ssb-bendy-butt"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.4.tgz"; - sha512 = "zyVPwizCuW6T3Q2j8XerTPpdhNYY9tLlIVieg/FFQb5wlda3Ce360mYjGngx7586HXgysBi010JpM9emMQhhtA=="; + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz"; + sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; }; }; - "ssb-bfe-3.1.1" = { + "ssb-bfe-3.1.3" = { name = "ssb-bfe"; packageName = "ssb-bfe"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; - sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.3.tgz"; + sha512 = "peX4B+Exp5OokaOnxP8atPd0jhig1AaCQyLY+MykxXIzTEim7yWAavzSDHaZ+7PNHS9fbM7E2s+h3h/R3oSfTA=="; }; }; - "ssb-bfe-spec-0.3.0" = { + "ssb-bfe-spec-0.4.0" = { name = "ssb-bfe-spec"; packageName = "ssb-bfe-spec"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; - sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.4.0.tgz"; + sha512 = "KhUl8MZ14JQ00rmsrddSTDIfy5ez4O9nZOrJ8A+Kg5VdG9ENOpLCqc+CzsZpSdhDeUfFUicSMH1mUhJNlRyIAQ=="; }; }; "ssb-blobs-1.2.2" = { @@ -60827,13 +61736,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.9" = { + "ssb-db2-2.8.10" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.9"; + version = "2.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.9.tgz"; - sha512 = "0v6EIq+MrQbe5wO+0JGeNUY9fs8dA2/vcgGOQSqYKl2dkxKB4uu8g6z6GRtlcSP7iGxW+Zv7jk/09b3p1ahE4g=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.10.tgz"; + sha512 = "wa61qZecXECi+/6qok4Mk4Y3uC/cqvjjxF5rVgZZnAm2QXiujwIru0zsCHElfB+MYTw+U5viZTOxwoGaBk0GwA=="; }; }; "ssb-ebt-5.6.7" = { @@ -61088,13 +61997,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.7.0" = { + "ssb-uri2-1.7.1" = { name = "ssb-uri2"; packageName = "ssb-uri2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.0.tgz"; - sha512 = "mdQEo4AT9cusd5+eXpS/rh8UjVVt0A9kLXfs/JMIVcMHEsOciK4ThIzQCqK8hVrxHRGpb09+t/DluVvXuN8/JQ=="; + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.1.tgz"; + sha512 = "iUzWf4yB+Pf6YZD5r+FV/UB7BZ5zQK57qws3d5hHqsO8QM2DRfU0i8SNFBFGPLvEQL8AT8XKbAhNIVwl/f0PWw=="; }; }; "ssb-validate-4.1.4" = { @@ -61133,13 +62042,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.206" = { + "sscaff-1.2.216" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.206"; + version = "1.2.216"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.206.tgz"; - sha512 = "uhkbY110y2Cbe3ELcuDm5PR99cPzLDApVt0D9tL9yIzzMlGEXdY7bxhDTu31YssRotnFdOiMx3i2vtkVbTOFww=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.216.tgz"; + sha512 = "wMcmaDSnfbbcFtuRZc2UJUUbM5CQsXJOS27H0vTAMJlvP/MT+GlgtiBVPBIJ2iQGQM49Nhrh8Ec18cHePUCF5w=="; }; }; "ssh-config-1.1.6" = { @@ -61412,6 +62321,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -61997,13 +62915,13 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-5.1.0" = { + "string-width-5.1.2" = { name = "string-width"; packageName = "string-width"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz"; - sha512 = "7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ=="; + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -62546,6 +63464,15 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; + "stylehacks-5.1.0" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; + sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; + }; + }; "stylelint-13.13.1" = { name = "stylelint"; packageName = "stylelint"; @@ -62582,15 +63509,6 @@ let sha512 = "vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg=="; }; }; - "stylus-0.55.0" = { - name = "stylus"; - packageName = "stylus"; - version = "0.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz"; - sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; - }; - }; "stylus-supremacy-2.15.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -62924,13 +63842,13 @@ let sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg=="; }; }; - "svelte-preprocess-4.10.3" = { + "svelte-preprocess-4.10.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.3.tgz"; - sha512 = "ttw17lJfb/dx2ZJT9sesaXT5l7mPQ9Apx1H496Kli3Hkk7orIRGpOw6rCPkRNzr6ueVPqb4vzodS5x7sBFhKHw=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz"; + sha512 = "fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A=="; }; }; "svelte2tsx-0.5.5" = { @@ -62996,6 +63914,15 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; + "svgo-2.8.0" = { + name = "svgo"; + packageName = "svgo"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; + sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -63221,13 +64148,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.3" = { + "systeminformation-5.11.6" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.3"; + version = "5.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.3.tgz"; - sha512 = "sjvlk4SUefhwrONUeLijXt+NQyptAiqShd5v6bFJFNr9EVJUr3YSnNxDqCz0gp5EJBUj88pL1ssc8ZHPtngBOw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.6.tgz"; + sha512 = "7KBXgdnIDxABQ93w+GrPSrK/pup73+fM09VGka4A/+FhgzdlRY0JNGGDFmV8BHnFuzP9zwlI3n64yDbp7emasQ=="; }; }; "sywac-1.3.0" = { @@ -63762,13 +64689,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.10.0" = { + "terser-5.12.0" = { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63996,13 +64923,13 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thread-stream-0.13.1" = { + "thread-stream-0.13.2" = { name = "thread-stream"; packageName = "thread-stream"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.1.tgz"; - sha512 = "+KNCqNxOSwYfXLtCIRDKQq29x9jvqnOFjYCPdB38sf4pT3QanPSNc8vRqMj+Q3z4tYIctb5opNZrMK/GwmgsAQ=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.2.tgz"; + sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; }; }; "thriftrw-3.12.0" = { @@ -64347,6 +65274,15 @@ let sha512 = "2hPuUGCroLrxh6xxwoe+1RgPpOOK1w2uTnhgiHBpvoutBR+krNuT4hOXQyOaaYnZgoXBB6hBYkuAJHxyeBOPzQ=="; }; }; + "tiny-secp256k1-2.2.1" = { + name = "tiny-secp256k1"; + packageName = "tiny-secp256k1"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.1.tgz"; + sha512 = "/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng=="; + }; + }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -64716,13 +65652,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-4.1.1" = { + "token-types-4.2.0" = { name = "token-types"; packageName = "token-types"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; - sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz"; + sha512 = "P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w=="; }; }; "too-hot-1.0.0" = { @@ -65121,13 +66057,13 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "trough-2.0.2" = { + "trough-2.1.0" = { name = "trough"; packageName = "trough"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-2.0.2.tgz"; - sha512 = "FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w=="; + url = "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz"; + sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; }; }; "truncate-2.1.0" = { @@ -65229,13 +66165,13 @@ let sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; }; }; - "ts-node-10.5.0" = { + "ts-node-10.6.0" = { name = "ts-node"; packageName = "ts-node"; - version = "10.5.0"; + version = "10.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.5.0.tgz"; - sha512 = "6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.6.0.tgz"; + sha512 = "CJen6+dfOXolxudBQXnVjRVvYTmTWbyz7cn+xq2XTsvnaXbHqr4gXSCNbS2Jj8yTZMuGwUoBESLaOkLascVVvg=="; }; }; "ts-node-8.9.1" = { @@ -65760,15 +66696,6 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; - "type-fest-2.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.10.0.tgz"; - sha512 = "u2yreDMllFI3VCpWt0rKrGs/E2LO0YHBwiiOIj+ilQh9+ALMaa4lNBSdoDvuHN3cbKcYk9L1BXP49x9RT+o/SA=="; - }; - }; "type-fest-2.11.1" = { name = "type-fest"; packageName = "type-fest"; @@ -65796,15 +66723,6 @@ let sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA=="; }; }; - "type-fest-2.9.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.9.0.tgz"; - sha512 = "uC0hJKi7eAGXUJ/YKk53RhnKxMwzHWgzf4t92oz8Qez28EBgVTfpDTB59y9hMYLzc/Wl85cD7Tv1hLZZoEJtrg=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -65949,6 +66867,15 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; + "typescript-4.6.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -66093,6 +67020,15 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; + "uglify-js-3.15.2" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz"; + sha512 = "peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -66210,6 +67146,15 @@ let sha512 = "aIvEHNRX1AlOYAr6qSUjQBn4mCduxx6MtC967aRDTb2UUBPj0Ix2ZFQDcmXUUO/UxRPHcw1f5a5nVbCSKDSOqA=="; }; }; + "uint8array-tools-0.0.7" = { + name = "uint8array-tools"; + packageName = "uint8array-tools"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.7.tgz"; + sha512 = "vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -66948,13 +67893,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.0" = { + "unist-util-stringify-position-3.0.1" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; - sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.1.tgz"; + sha512 = "HDVOJ704Uj5QWqoB6KV4CDP62OW9wam9BEuwGE4fvunhVraZcO/fFNBCpvmDDSlkFBG/GAYdHfKvKvDAJxzcWA=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -67524,13 +68469,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.7" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.7"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz"; - sha512 = "HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "url-parse-as-address-1.0.0" = { @@ -67876,6 +68821,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -68641,6 +69595,15 @@ let sha512 = "Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ=="; }; }; + "vfile-5.3.1" = { + name = "vfile"; + packageName = "vfile"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.1.tgz"; + sha512 = "EWkoULWVDBV3ozmE21TA0qekXreWJXV1jKcF8rgnvmmH0L9Vm8eTSnuuSSpH2XpLXZLJ0uMMIHUqDLHjK5lh4w=="; + }; + }; "vfile-find-down-1.0.0" = { name = "vfile-find-down"; packageName = "vfile-find-down"; @@ -68731,6 +69694,15 @@ let sha512 = "4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g=="; }; }; + "vfile-message-3.1.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.1.tgz"; + sha512 = "pz5xA88aupQPuXmY46xnGAv8MzAcU1Xi2Do3UftjTdvQHreXCWvJT/BbzYixPNYRek+EAioI0kP3crJu37xa6Q=="; + }; + }; "vfile-reporter-1.5.0" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -68947,13 +69919,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.8" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.8"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz"; - sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "voc-1.2.0" = { @@ -69100,13 +70072,13 @@ let sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; }; }; - "vscode-html-languageservice-4.2.1" = { + "vscode-html-languageservice-4.2.2" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.1.tgz"; - sha512 = "PgaToZVXJ44nFWEBuSINdDgVV6EnpC3MnXBsysR3O5TKcAfywbYeRGRy+Y4dVR7YeUgDvtb+JkJoSkaYC0mxXQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.2.tgz"; + sha512 = "4ICwlpplGbiNQq6D/LZr4qLbPZuMmnSQeX/57UAYP7jD1LOvKeru4lVI+f6d6Eyd7uS46nLJ5DUY4AAlq35C0g=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -69208,13 +70180,13 @@ let sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; }; }; - "vscode-jsonrpc-8.0.0-next.6" = { + "vscode-jsonrpc-8.0.0-next.7" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.0-next.6"; + version = "8.0.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz"; - sha512 = "6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz"; + sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -69316,13 +70288,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.8" = { + "vscode-languageserver-8.0.0-next.9" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.8"; + version = "8.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.8.tgz"; - sha512 = "Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.9.tgz"; + sha512 = "PO+ijJdI9NGXklkZlvEHLpVloBd0iBiOi2EXuh2QfT4bOlx2qvsWu+nBISuw0X8ZfXA4grtaPPGcrXudmlezLg=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -69361,13 +70333,13 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.14" = { + "vscode-languageserver-protocol-3.17.0-next.15" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.14"; + version = "3.17.0-next.15"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz"; - sha512 = "iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.15.tgz"; + sha512 = "73LffxyP/0TRyk3J7bCYt0BuFBzk4Qvo5TqZndOsP+uBDbRV4IT7ebu4M/XoPDSCyZ+jDIxW7if/JbhBznmwBg=="; }; }; "vscode-languageserver-protocol-3.17.0-next.5" = { @@ -69487,13 +70459,13 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; - "vscode-languageserver-types-3.17.0-next.7" = { + "vscode-languageserver-types-3.17.0-next.8" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.0-next.7"; + version = "3.17.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz"; - sha512 = "KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.8.tgz"; + sha512 = "Mwj+FemiEk4QUUms1GGvXwDC+laJGVFuA4glbMVJTxfXdfOFZaEuyVlLobjccBo+NzD+5oEzzejTX7nWGNajjQ=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -69856,6 +70828,15 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "weak-lru-cache-1.2.2" = { + name = "weak-lru-cache"; + packageName = "weak-lru-cache"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; + sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; + }; + }; "weasel-words-0.1.1" = { name = "weasel-words"; packageName = "weasel-words"; @@ -70270,13 +71251,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.2" = { + "webtorrent-1.8.3" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.2.tgz"; - sha512 = "rQfrYF/2pq81c8whgTEQtqMlp0HosA4yB7R4EUq+6Q0087bO2GbDxiBKTIZuBcMUgK+2jq/+TgTdXnZ9cBabcw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.3.tgz"; + sha512 = "VZRYk0jvMvMpWPjZJi0pg3B8guX7uLLoDgvsxFdF1KKQDBSy8QVwL5BOJaaC3LGi+RYwBIKRGUy4DiW5SMSyng=="; }; }; "whatwg-encoding-1.0.5" = { @@ -71720,6 +72701,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "xxhash-wasm-0.4.2" = { + name = "xxhash-wasm"; + packageName = "xxhash-wasm"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; + sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; + }; + }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -72071,13 +73061,13 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.0" = { + "yargs-parser-21.0.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "21.0.0"; + version = "21.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; "yargs-parser-4.2.1" = { @@ -72428,15 +73418,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.2.4"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.4.tgz"; - sha512 = "Llk0RzrpzCsAIgX4wk8QIB7xZInyLT07r6gF9dc9b0latHsJyRpeZXdPcFmT2wny0cin+1Y9q6HsBe4Srs19SA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.5.tgz"; + sha512 = "S1uuScNCue6K7HpSG707/N+ULy+utrByeYLjx8zIwIOW1/ZjLB+1/Dxem3bu/OSLY2j2R7bX1WHw8Mnljnk4QQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1302.4" - sources."@angular-devkit/core-13.2.4" - sources."@angular-devkit/schematics-13.2.4" + sources."@angular-devkit/architect-0.1302.5" + sources."@angular-devkit/core-13.2.5" + sources."@angular-devkit/schematics-13.2.5" sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" @@ -72445,12 +73435,12 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.2.4" + sources."@schematics/angular-13.2.5" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-8.9.0" sources."ajv-formats-2.1.1" @@ -72501,7 +73491,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -72571,7 +73561,7 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.0" sources."make-fetch-happen-10.0.3" ]; }) @@ -72644,10 +73634,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.13.0"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.0.tgz"; - sha512 = "p4/11Pu+NwjVZ+XUdfD7p102xudpu9I3FnSaEA+2SCve166TXg5ivRVm1+sk383IIc1Ducxefkfad5EmUO6ujA=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.2.tgz"; + sha512 = "iKhPlNUE6fs0g7iRdTJzWFB8XoQb4AbCT46V0mrMsdF1RzyvwnOuzxSjISHQdYzpfirihVG9XpAUy/X540qavg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72693,7 +73683,7 @@ in sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."has-flag-3.0.0" sources."inherits-2.0.4" @@ -72727,7 +73717,7 @@ in sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."type-fest-1.4.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -72817,7 +73807,7 @@ in sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" @@ -72842,7 +73832,7 @@ in sources."handlebars-4.7.7" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hpagent-0.1.2" sources."ignore-5.2.0" sources."inflight-1.0.6" @@ -72944,7 +73934,7 @@ in sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -72956,7 +73946,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -72996,10 +73986,10 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.8.8"; + version = "0.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.8.tgz"; - sha512 = "XgBSVpqXEqGTdst+CnM03/nXYw9PYNAfTl27BaJuUhEtqA/iDlyM7wLnQMsJzwWVmoLqp0bCumHkb62NtfeDNA=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.9.tgz"; + sha512 = "y9f/vsU7kLec98KMcT+76QMVf066ofzoFzFgoGUfACKbqYId8jp4sFAfPwYlDSmL4k2lryo64HCr9pRoG9slIA=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.3" @@ -73036,7 +74026,7 @@ in sources."source-map-0.7.3" sources."to-regex-range-5.0.1" sources."ts-morph-12.2.0" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" (sources."vscode-emmet-helper-2.1.2" // { dependencies = [ @@ -73059,6 +74049,7 @@ in ]; buildInputs = globalBuildInputs; meta = { + description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)"; license = "MIT"; }; production = true; @@ -73357,7 +74348,7 @@ in sources."@tsconfig/node14-1.0.1" sources."@tsconfig/node16-1.0.2" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -73380,7 +74371,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-1.0.5" + sources."cosmiconfig-typescript-loader-1.0.6" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -73400,7 +74391,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."find-up-4.1.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" @@ -73500,9 +74491,9 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.5.0" + sources."ts-node-10.6.0" sources."type-fest-0.18.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -73515,7 +74506,7 @@ in sources."yaml-1.10.2" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -73580,13 +74571,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -73651,7 +74642,7 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" @@ -73660,16 +74651,16 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-p12-pem-3.1.3" sources."googleapis-76.0.0" - sources."googleapis-common-5.0.5" + sources."googleapis-common-5.1.0" sources."got-11.8.3" sources."graceful-fs-4.2.9" sources."gtoken-5.3.2" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -73828,9 +74819,9 @@ in }) sources."tslib-2.3.1" sources."type-fest-0.21.3" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" sources."url-template-2.0.8" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -73871,7 +74862,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."acorn-8.7.0" @@ -74016,7 +75007,7 @@ in ]; }) sources."hyperswarm-2.15.3" - sources."hypertrie-5.1.2" + sources."hypertrie-5.1.3" sources."identify-filetype-1.0.0" sources."ieee754-1.2.1" sources."immediate-3.3.0" @@ -74196,7 +75187,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."which-1.3.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -74265,7 +75256,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -75066,7 +76057,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -75281,10 +76272,10 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.6" // { + (sources."@nestjs/schematics-8.0.7" // { dependencies = [ - sources."@angular-devkit/core-13.2.2" - sources."@angular-devkit/schematics-13.2.2" + sources."@angular-devkit/core-13.2.4" + sources."@angular-devkit/schematics-13.2.4" ]; }) sources."@types/eslint-8.4.1" @@ -75292,7 +76283,7 @@ in sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -75351,10 +76342,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.9.0" // { + (sources."enhanced-resolve-5.9.1" // { dependencies = [ sources."tapable-2.2.1" ]; @@ -75383,7 +76374,7 @@ in sources."fs-extra-9.1.0" ]; }) - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -75515,7 +76506,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-1.1.3" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -75752,7 +76743,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1084.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -75853,7 +76844,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."helmet-4.6.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -76008,7 +76999,7 @@ in ]; }) sources."url-0.10.3" - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" sources."url-value-parser-2.1.0" sources."utils-merge-1.0.1" sources."uuid-8.1.0" @@ -76067,7 +77058,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -76081,7 +77072,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -76108,7 +77099,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -76237,7 +77228,7 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -76481,7 +77472,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -76639,7 +77630,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -77415,7 +78406,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -77782,7 +78773,7 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."type-fest-1.4.0" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -77812,7 +78803,7 @@ in sources."unist-util-position-4.0.1" sources."unist-util-position-from-estree-1.1.1" sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.1" (sources."unist-util-visit-4.1.0" // { dependencies = [ sources."unist-util-visit-parents-5.1.0" @@ -77842,7 +78833,7 @@ in dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."supports-color-9.2.1" ]; @@ -77901,7 +78892,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -77933,7 +78924,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -78059,7 +79050,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."destroy-1.1.0" + sources."destroy-1.1.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -78080,7 +79071,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-assert-1.5.0" (sources."http-errors-1.8.1" // { @@ -78141,7 +79132,7 @@ in }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."only-0.0.2" sources."parseurl-1.3.3" sources."passthrough-counter-1.0.0" @@ -78195,7 +79186,7 @@ in }) sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."ylru-1.2.1" ]; buildInputs = globalBuildInputs; @@ -78219,7 +79210,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -78305,7 +79296,7 @@ in dependencies = [ sources."browserslist-4.19.3" sources."caniuse-lite-1.0.30001312" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."escalade-3.1.1" sources."fraction.js-4.1.3" sources."node-releases-2.0.2" @@ -78333,14 +79324,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1084.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78379,7 +79370,7 @@ in sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" @@ -78417,7 +79408,7 @@ in sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -78475,7 +79466,7 @@ in ]; }) sources."querystring-0.2.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -78490,7 +79481,7 @@ in sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -78958,10 +79949,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.53.6"; + version = "11.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.53.6.tgz"; - sha512 = "5ixQmBCFYSCjyW0dMPrCfBFygmlrHjHbcBWsmRQsHwnupe7smQUFP3T5PkzHAyO5VQyWTsFTJsJ9V6+REdGjzw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.56.0.tgz"; + sha512 = "Am07Njmv2VGXapth/SVz80+5LE5+LDtPSmFC8f7uyG/8KGaEHHPnry+tskWsiOPEe+lwbbLry78iWSNgOtiffQ=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -79010,7 +80001,7 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -79354,15 +80345,31 @@ in sources."ws-8.2.3" ]; }) - (sources."ln-service-53.9.1" // { + (sources."ln-service-53.9.2" // { dependencies = [ sources."@grpc/grpc-js-1.5.5" + sources."@types/node-17.0.18" sources."body-parser-1.19.2" sources."bolt09-0.2.2" sources."bytes-3.1.2" - sources."lightning-5.8.1" + sources."cookie-0.4.2" + sources."express-4.17.3" + (sources."lightning-5.8.1" // { + dependencies = [ + sources."bytes-3.1.1" + sources."cookie-0.4.1" + (sources."express-4.17.2" // { + dependencies = [ + sources."body-parser-1.19.1" + ]; + }) + sources."qs-6.9.6" + sources."raw-body-2.4.2" + ]; + }) sources."qs-6.9.7" sources."raw-body-2.4.3" + sources."safe-buffer-5.2.1" sources."type-fest-2.11.2" sources."ws-8.5.0" ]; @@ -79377,50 +80384,7 @@ in sources."ws-8.5.0" ]; }) - (sources."ln-telegram-3.17.3" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.3" - sources."@types/node-17.0.16" - sources."bech32-1.1.4" - sources."bitcoinjs-lib-5.2.0" - sources."bn.js-4.12.0" - sources."invoices-2.0.3" - sources."lightning-5.6.3" - sources."ln-service-53.8.0" - (sources."ln-sync-3.10.0" // { - dependencies = [ - sources."@types/node-17.0.15" - sources."lightning-5.6.2" - sources."ln-service-53.7.3" - sources."ws-8.4.2" - ]; - }) - (sources."paid-services-3.11.0" // { - dependencies = [ - sources."@types/node-17.0.10" - sources."bech32-2.0.0" - sources."bitcoinjs-lib-6.0.1" - sources."bn.js-5.2.0" - sources."lightning-5.3.4" - sources."ln-service-53.5.1" - (sources."ln-sync-3.7.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@types/node-17.0.8" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."type-fest-2.9.0" - ]; - }) - sources."ws-8.4.2" - ]; - }) - sources."psbt-1.1.10" - sources."tiny-secp256k1-1.1.6" - sources."type-fest-2.10.0" - sources."ws-8.5.0" - ]; - }) + sources."ln-telegram-3.19.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -79440,7 +80404,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.3.0" + sources."luxon-2.3.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -79502,7 +80466,12 @@ in sources."semver-6.3.0" ]; }) - sources."paid-services-3.11.4" + (sources."paid-services-3.12.1" // { + dependencies = [ + sources."tiny-secp256k1-2.2.1" + sources."uint8array-tools-0.0.7" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" @@ -80056,7 +81025,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.51.0" + sources."mime-db-1.52.0" sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -80217,7 +81186,7 @@ in sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -80415,7 +81384,7 @@ in sources."cookie-0.4.2" sources."debug-3.1.0" sources."decamelize-1.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" sources."dlv-1.1.3" @@ -80454,9 +81423,9 @@ in sources."has-ansi-2.0.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - (sources."http-errors-1.8.1" // { + (sources."http-errors-2.0.0" // { dependencies = [ - sources."statuses-1.5.0" + sources."statuses-2.0.1" ]; }) sources."http-proxy-1.18.1" @@ -80507,7 +81476,7 @@ in sources."portscanner-2.1.1" sources."qs-6.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -80523,6 +81492,7 @@ in (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80532,6 +81502,7 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80801,7 +81772,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -81081,7 +82052,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -81622,7 +82593,7 @@ in }) ]; }) - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dir-glob-2.0.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" @@ -81711,7 +82682,7 @@ in ]; }) sources."hosted-git-info-2.8.9" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -81900,7 +82871,7 @@ in }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" @@ -81989,7 +82960,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -82088,10 +83059,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.102"; + version = "1.0.111"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.102.tgz"; - sha512 = "rOtaUXYtiW143Cgh8knV0Xkd7yNTqwvu+jqrUTycXAT8vZYL2ytbCkeAT09Knn3WCtVHUbkwSAnzOli8zNZIcA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.111.tgz"; + sha512 = "UcChIatml058bkeCiB+Wkx1ThTgzS1qPxdG4/DpsbWeSSLBwEBl9PXChBcpHSMI0d4UWygbQLlkAdaDKijcD2Q=="; }; dependencies = [ sources."@jsii/check-node-1.54.0" @@ -82110,8 +83081,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.20" - sources."cdk8s-plus-22-1.0.0-beta.121" + sources."cdk8s-1.5.30" + sources."cdk8s-plus-22-1.0.0-beta.131" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -82124,7 +83095,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.221" + sources."constructs-3.3.231" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-5.0.1" @@ -82162,7 +83133,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" @@ -82211,14 +83182,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.480" // { + (sources."jsii-srcmak-0.1.490" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.140" + sources."json2jsii-0.2.150" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -82262,10 +83233,10 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.206" + sources."sscaff-1.2.216" (sources."streamroller-3.0.2" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."string-width-4.2.3" @@ -82314,10 +83285,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.1.tgz"; - sha512 = "Qa542vXUXn8tzqGkcAvLWGSpFbhOXalOystXu8sSZn82eCpCTo2CxEpoHOFeUgNkymUOFwWawl5+CIMYr7V1+Q=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.4.tgz"; + sha512 = "C7nL+AVA2ltmRhFdAb6yinXzjumRIAyaNi1p5QyZpythrg6+GThxZS/We+s8GIA000uIrPMvesuHCE+dGxkssw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -82327,9 +83298,9 @@ in sources."@babel/parser-7.17.3" sources."@babel/template-7.16.7" sources."@babel/types-7.17.0" - sources."@cdktf/hcl2cdk-0.9.1" - sources."@cdktf/hcl2json-0.9.1" - sources."@cdktf/provider-generator-0.9.1" + sources."@cdktf/hcl2cdk-0.9.4" + sources."@cdktf/hcl2json-0.9.4" + sources."@cdktf/provider-generator-0.9.4" (sources."@jsii/check-node-1.54.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -82344,7 +83315,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@xmldom/xmldom-0.8.1" sources."ansi-regex-5.0.1" @@ -82358,7 +83329,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.9.1" + sources."cdktf-0.9.4" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" @@ -82372,7 +83343,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.66" + sources."constructs-10.0.76" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-1.2.0" @@ -82405,12 +83376,12 @@ in sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" - sources."graphology-0.23.2" + sources."graphology-0.24.1" sources."graphology-types-0.21.2" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -82433,7 +83404,7 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-valid-domain-0.1.5" + sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" @@ -82509,7 +83480,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.480" // { + (sources."jsii-srcmak-0.1.490" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -82568,7 +83539,7 @@ in sources."spdx-license-list-6.4.0" (sources."streamroller-3.0.2" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."jsonfile-6.1.0" sources."universalify-2.0.0" ]; @@ -82611,7 +83582,7 @@ in sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) (sources."yargs-parser-18.1.3" // { @@ -82948,10 +83919,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.6.tgz"; - sha512 = "FXi6gZE0NpiPeFoc3BW4BBv33KA2Vl8JFltWb2i9TXS3zXWXfIilRFh7iQiFclIAYaQxO/i6qbaSqatd6+BksA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.7.tgz"; + sha512 = "QA6ZdSnW9ZHmQcaDF0+KZj9FnoJJFksk6t76VpXtBZUhzlRPoEWkpNPoVaN4uXwefMN6br4eLBxhVWW8gp8w4w=="; }; buildInputs = globalBuildInputs; meta = { @@ -82966,10 +83937,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.22.6"; + version = "0.22.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.6.tgz"; - sha512 = "EHCWYn3aXttvkbfV1svUgbwoyC1t0LW/K05txNyoMygYtp1qGW2cl/Ro9h0qE7l2FZIgJ8vM1JW8d3az1dsgBw=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.7.tgz"; + sha512 = "GVDG9GbqbeZOXrU0gChJP5eFv29vbcV6QudUNq/fVSWLLV/wZPREoxYQCM4hWEreDPDfB/fkSddOEJHoF4F+Vg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -83048,10 +84019,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.7.tgz"; - sha512 = "rtt2W7g8oTfg1ZAIu+Y3gDqI305j68edgJJjWpdTSQHZXq2i9T0keaWHZAIdgV819wxTcBoaghCLNjDf1rPHJA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.9.tgz"; + sha512 = "erTk5v3v8MRPCvgkBJ8K4YtUOiVU31oZz8HN+ioNG9PdcIwJzGMRyMgj8qYPsiNk2nhg63kyyl5x762q2FgjyQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83117,7 +84088,7 @@ in sha512 = "HtFYiBx2ZIFairTsfDwLsMUTGwlH498VzAipWZeCOIGf7ZXetEbv0t+wr7IAy2KMIwhlmzoMsi5aHSlUupxGHA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -83289,7 +84260,7 @@ in sources."flatted-3.2.5" sources."follow-redirects-1.14.9" sources."fp-ts-2.11.8" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { @@ -83306,7 +84277,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -83457,10 +84428,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "9.2.1"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.1.tgz"; - sha512 = "SsPPkZf82fEkiISWC5JJbf5JvfBe7nBPPxAXPSXx8J9Wql8O9ZAx9oiLF7jmnwjGlRpaGkazf6LW2IEVYrXPZA=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.3.tgz"; + sha512 = "LkwQTBlD/chH0BTl7zFMw+M1CKbVIy8W49nVLuB+wmgS3dqnKZo58PRTYkcX2X25/FIWOh/oMSjWoZ8cTck8zQ=="; }; dependencies = [ sources."prettier-2.5.1" @@ -83478,13 +84449,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.220"; + version = "1.1.223"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.220.tgz"; - sha512 = "M0GVuo8jgQxI/YqkExByeAkjwEvu8uqGicYD4zRctxU/THd1CQUvIWWFDKB1a7co8sCntZlMnhqqxAF4CLyYQw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.223.tgz"; + sha512 = "ILWzT0OqD24ppvGnVmjQZYygUtDWAVxvLeXkcsJuIk4ED8O9ezFbPbD3GeBrLWG87X3mC37vb/k6EsF1BR6pUQ=="; }; dependencies = [ - sources."pyright-1.1.222" + sources."pyright-1.1.226" ]; buildInputs = globalBuildInputs; meta = { @@ -83558,10 +84529,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.60.0"; + version = "0.60.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.0.tgz"; - sha512 = "GbRP3O/ZmnjiAnPDtqoQ+jJIzgCwinENp8lxlQdSPkXjW2vwgd4DTkYLU2p3/0BMoHn9zNCzM5iBO+OLei5upA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.1.tgz"; + sha512 = "wEVUE817neA7EpWGZwCYhzUbcJTHyFBihyfljCPIqTTxWF/zcctuhKhzsPzyhrKk18sbX0pBFO+/aubgwBQrow=="; }; buildInputs = globalBuildInputs; meta = { @@ -83594,10 +84565,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.8"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.8.tgz"; - sha512 = "Ku7Hf2MYJwYGuGMz6Qt9k46NQd+9+VcF0MeKuVTpIPtVIaKqRtKg6alDL+less7r6U2twIKWQTdYeqRCZBLnag=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.5.7.tgz"; + sha512 = "ruWc4BFR78x2EQMoLUkdAi2yeoipIuNwbl88VX8bPNbVVB1kB22VqDJ9TqcDU6az8VP2tQd0V4V/ZsdeLgBF6g=="; }; buildInputs = globalBuildInputs; meta = { @@ -83645,7 +84616,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -83733,7 +84704,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83974,10 +84945,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.6.tgz"; - sha512 = "6yKBny54MoGpm2bWwx2SX8O8cYjFgcQtfxg8klZoh1Nhxjamo2eNALjyvtOc/N9o7Mh+w/hn4nApXiwoJZqy0g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz"; + sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -84104,13 +85075,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.12"; + version = "1.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.12.tgz"; - sha512 = "6eLxc/n1kfGPZz6hQNr4rT2b8CYHOsYSdrylJ3bxhdjA9sUmzF5Rjutjyz/4WKY7saVu30wmvfjdtPZDTyQUFw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.13.tgz"; + sha512 = "oczIpLpZ5VjUf8eFExa5kUJqgIMMtOLDgKRxpjkTVWM67dLczfQQY9BjiR2GjwZvdfMBp7PkpN3tBTOjPUaW5g=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -84241,7 +85212,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -84321,7 +85292,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -84367,10 +85338,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.1.tgz"; - sha512 = "mSnoYlb0J41LG6uTgGlLOj/jM4wEYKv1IhP0p7LUo+eZSzdlWuuP2r+zmNbd+MeN/k5ftcgahVSLaUv5QVtpsA=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.2.tgz"; + sha512 = "Lbs1R5QyTgdnbIQYr74RpOquC1t61mWBpZtAdB4pNHvZEF+IntcjHUm7Ns4ekdIvLgbiMncFatmKHXDRc3RpBg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84402,10 +85373,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.2.tgz"; - sha512 = "cYW24Fis8CUw2m7YDoe+49f8vkUCxvKJ0HK6lruU40nIvW4HRSByZX55zNRppQmtgDEb9h7Pnp9/tZHa85N0pA=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.4.tgz"; + sha512 = "fmn+qsWUwVTIxoAv0gH4rNZJKXmUZoaOpxomMzJJrQo0PN31cMXZzD55IV0eudk5VLos4ARUBhtsdcxBUfQ15w=="; }; dependencies = [ sources."prettier-2.0.5" @@ -84446,7 +85417,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.4" + sources."@xstate/fsm-1.6.5" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -84975,7 +85946,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -85024,7 +85995,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -85231,7 +86202,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -85526,7 +86497,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.11.3" + sources."systeminformation-5.11.6" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -85609,362 +86580,123 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; - sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.0.0.tgz"; + sha512 = "jYrVFg9/ZAl3GRg8ambMoCgCZIGhNO2HNte5jdJXXMSEtM1ZFxw+qo8290LVtWWDrzu++eUyTXoqcqZZNuv8AQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.2.0" - sources."@types/minimatch-3.0.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" sources."@types/normalize-package-data-2.4.1" - sources."aggregate-error-3.1.0" + sources."aggregate-error-4.0.0" sources."ansi-styles-3.2.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { + sources."arrify-3.0.0" + sources."braces-3.0.2" + sources."camelcase-6.3.0" + sources."camelcase-keys-7.0.2" + (sources."chalk-2.4.2" // { dependencies = [ - sources."define-property-1.0.0" + sources."escape-string-regexp-1.0.5" ]; }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."clean-stack-2.2.0" - sources."collection-visit-1.0.0" + sources."clean-stack-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" - sources."cp-file-7.0.0" - sources."cpy-8.1.2" - sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."cp-file-9.1.0" + sources."cpy-9.0.0" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-up-4.1.0" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" + sources."escape-string-regexp-5.0.0" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."function-bind-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.2.0" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."globby-9.2.0" + sources."glob-parent-5.1.2" + sources."globby-13.1.1" sources."graceful-fs-4.2.9" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - (sources."has-glob-1.0.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.9" - sources."ignore-4.0.6" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."hosted-git-info-4.1.0" + sources."ignore-5.2.0" + sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-core-module-2.8.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."junk-3.1.0" + sources."junk-4.0.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" + sources."lru-cache-6.0.0" sources."make-dir-3.1.0" - sources."map-cache-0.2.2" sources."map-obj-4.3.0" - sources."map-visit-1.0.0" - sources."meow-6.1.1" + sources."meow-10.1.2" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" ]; }) - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - (sources."normalize-package-data-2.5.0" // { + (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."semver-5.7.1" - ]; - }) - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - (sources."p-all-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" + sources."semver-7.3.5" ]; }) sources."p-event-4.2.0" - (sources."p-filter-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" - ]; - }) + sources."p-filter-3.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-5.3.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."parse-json-5.2.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."posix-character-classes-0.1.1" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-1.22.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-regex-1.1.0" + sources."path-type-4.0.0" + sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" + sources."quick-lru-5.1.1" + sources."read-pkg-6.0.0" + sources."read-pkg-up-8.0.0" + sources."redent-4.0.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."semver-6.3.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" + sources."slash-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."strip-indent-3.0.0" + sources."strip-indent-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."trim-newlines-3.0.1" - sources."type-fest-0.13.1" - sources."union-value-1.0.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" - sources."use-3.1.1" + sources."to-regex-range-5.0.1" + sources."trim-newlines-4.0.2" + sources."type-fest-1.4.0" sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - sources."yargs-parser-18.1.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -85995,7 +86727,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -86053,7 +86785,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -86168,7 +86900,7 @@ in sources."debug-2.6.9" sources."duplexer2-0.0.2" sources."envinfo-7.8.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" @@ -86354,7 +87086,7 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.5" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" sources."get-stdin-8.0.0" @@ -86695,7 +87427,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87112,7 +87844,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -87122,7 +87854,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -87140,7 +87872,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -87241,10 +87973,11 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" + sources."@types/minimist-1.2.2" sources."@types/node-14.18.12" sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.4" - sources."@types/rc-1.2.0" + sources."@types/rc-1.2.1" sources."@types/react-16.14.23" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" @@ -87365,7 +88098,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.9" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87462,7 +88195,7 @@ in sources."gud-1.0.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87645,7 +88378,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.49.8" // { + (sources."sass-1.49.9" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87758,7 +88491,7 @@ in sources."type-fest-0.3.1" sources."typed-styles-0.0.7" sources."typedarray-0.0.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -87778,7 +88511,7 @@ in }) sources."upath-1.2.0" sources."urix-0.1.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."use-debounce-3.4.3" @@ -87919,11 +88652,11 @@ in sources."dockerfile-ast-0.4.2" sources."dockerfile-language-service-0.8.1" sources."dockerfile-utils-0.9.4" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -88145,7 +88878,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -88153,12 +88886,12 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -88326,7 +89059,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -88339,7 +89072,7 @@ in sources."universalify-0.1.2" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" (sources."get-package-info-1.0.0" // { @@ -88641,7 +89374,7 @@ in sources."yallist-4.0.0" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -88715,7 +89448,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -88789,7 +89522,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -89726,7 +90459,7 @@ in }) sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -90305,7 +91038,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.49.8" // { + (sources."sass-1.49.9" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -90493,8 +91226,9 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ + sources."acorn-8.7.0" sources."source-map-0.7.3" ]; }) @@ -90728,18 +91462,18 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz"; - sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz"; + sha512 = "tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw=="; }; dependencies = [ - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."ignore-4.0.6" ]; }) - sources."@humanwhocodes/config-array-0.9.3" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -91036,7 +91770,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -91150,7 +91884,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" @@ -91162,7 +91896,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91622,7 +92356,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91829,7 +92563,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -92921,7 +93655,7 @@ in }) sources."url-join-4.0.0" sources."url-loader-4.1.1" - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -93164,7 +93898,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -93186,7 +93920,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93238,7 +93972,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.960912" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93329,7 +94063,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.3.2" // { + (sources."puppeteer-13.4.1" // { dependencies = [ sources."ws-8.5.0" ]; @@ -93461,7 +94195,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93833,7 +94567,7 @@ in sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" sources."@google-cloud/pubsub-2.19.0" - sources."@grpc/grpc-js-1.5.5" + sources."@grpc/grpc-js-1.5.7" sources."@grpc/proto-loader-0.6.9" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.1.1" // { @@ -93864,14 +94598,14 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."acorn-8.7.0" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -94169,7 +94903,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" @@ -94185,7 +94919,7 @@ in sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-gax-2.29.6" sources."google-p12-pem-3.1.3" sources."got-9.6.0" @@ -94454,7 +95188,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.3" sources."rc-1.2.8" - sources."re2-1.17.3" + sources."re2-1.17.4" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" @@ -94639,7 +95373,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -94904,7 +95638,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" @@ -94946,7 +95680,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -95343,7 +96077,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -95690,10 +96424,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.7.0.tgz"; - sha512 = "y5L+h7dtFjiKeBiiNtNw0HsgcMcTMokpfXHbXfIV7khCS1dxN9xtYx6lKvsxLX3ytxs3OsWTxeqfNhEB87wrNw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.9.0.tgz"; + sha512 = "e4pQ+7Z+9Cppql59fy0OOo2El+ERkzOCVW2+ev5CojiljDb4x/nUHIx9ahKhgA5136F0DaCZ6w/lrOWJmi3ZSQ=="; }; dependencies = [ sources."@ampproject/remapping-2.1.2" @@ -95719,7 +96453,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -95744,7 +96478,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.2.0" @@ -95753,7 +96487,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -95819,7 +96553,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.7.0" + sources."create-gatsby-2.9.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95846,7 +96580,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -95878,11 +96612,11 @@ in sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.7.0" - (sources."gatsby-telemetry-3.7.0" // { + sources."gatsby-core-utils-3.9.0" + (sources."gatsby-telemetry-3.9.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95907,7 +96641,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."htmlparser2-6.1.0" @@ -95916,6 +96650,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."import-from-4.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -95948,6 +96683,7 @@ in sources."keyv-4.1.1" sources."kleur-3.0.3" sources."latest-version-5.1.0" + sources."lmdb-2.2.3" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -95967,9 +96703,13 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."ms-2.1.2" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" sources."mute-stream-0.0.8" + sources."nan-2.15.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" + sources."node-gyp-build-4.3.0" sources."node-object-hash-2.3.10" sources."node-releases-2.0.2" sources."normalize-url-6.1.0" @@ -95980,6 +96720,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" + sources."ordered-binary-1.2.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -96094,7 +96835,7 @@ in sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.20.2" @@ -96106,6 +96847,7 @@ in sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."uuid-3.4.0" + sources."weak-lru-cache-1.2.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -96151,10 +96893,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.7.tgz"; - sha512 = "T6i3kosKqbzgVP99cFpGyovKpNHpTmxPIZjfbNMlyCinj1oIclZ3qcHnI7jttJbXb/XHfNPqDLKQEHL+jCHTZQ=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.8.tgz"; + sha512 = "0VMjRsX2HVhDboVUJIZ2N6ig7f/KG69V1AlTGIMUcxQzeLtjAFtxSdFQ2Z+hjmsu4Wjl6RjPj6NczIu3eSZ6mQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96405,6 +97147,7 @@ in sources."asyncmemo-1.0.0" sources."chloride-2.4.1" sources."chloride-test-1.2.4" + sources."clarify-error-1.0.0" sources."commander-2.20.3" sources."debug-4.3.3" sources."deep-extend-0.6.0" @@ -96425,7 +97168,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" @@ -96449,7 +97192,7 @@ in sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."nearley-2.20.1" sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" @@ -96475,11 +97218,7 @@ in sources."pull-git-packidx-parser-1.0.0" sources."pull-git-remote-helper-2.0.0" sources."pull-git-repo-1.2.1" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" sources."pull-hyperscript-0.2.2" @@ -96615,12 +97354,12 @@ in sources."@gitbeaker/core-35.4.0" sources."@gitbeaker/node-35.4.0" sources."@gitbeaker/requester-utils-35.4.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96658,7 +97397,7 @@ in sources."got-11.8.3" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" @@ -96683,7 +97422,11 @@ in sources."object-inspect-1.12.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.0" + ]; + }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" sources."qs-6.10.3" @@ -96808,7 +97551,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -96852,7 +97595,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" @@ -96969,7 +97712,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -97021,7 +97764,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -97048,7 +97791,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -97249,7 +97992,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -97315,9 +98058,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.5" // { + (sources."@graphql-tools/import-6.6.6" // { dependencies = [ - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97342,10 +98085,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.1" // { + (sources."@graphql-tools/schema-8.3.2" // { dependencies = [ - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97376,7 +98119,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97535,7 +98278,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" @@ -97830,7 +98573,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97866,15 +98609,15 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.3.1" - sources."@graphql-tools/delegate-8.5.0" - sources."@graphql-tools/graphql-file-loader-7.3.3" - sources."@graphql-tools/import-6.6.5" - sources."@graphql-tools/json-file-loader-7.3.3" - sources."@graphql-tools/load-7.5.1" - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/schema-8.3.1" - (sources."@graphql-tools/url-loader-7.7.1" // { + sources."@graphql-tools/batch-execute-8.3.2" + sources."@graphql-tools/delegate-8.5.1" + sources."@graphql-tools/graphql-file-loader-7.3.4" + sources."@graphql-tools/import-6.6.6" + sources."@graphql-tools/json-file-loader-7.3.4" + sources."@graphql-tools/load-7.5.2" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/schema-8.3.2" + (sources."@graphql-tools/url-loader-7.7.2" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -97884,8 +98627,8 @@ in sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.1" - sources."@graphql-tools/wrap-8.4.0" + sources."@graphql-tools/utils-8.6.2" + sources."@graphql-tools/wrap-8.4.2" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -97895,7 +98638,11 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + (sources."@oclif/parser-3.8.7" // { + dependencies = [ + sources."@oclif/errors-1.3.5" + ]; + }) (sources."@oclif/plugin-help-3.2.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -97917,10 +98664,10 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.5" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."ansi-escapes-3.2.0" @@ -97984,7 +98731,7 @@ in sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.24" + sources."cross-undici-fetch-0.1.25" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" sources."debug-4.3.3" @@ -98044,7 +98791,7 @@ in sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" sources."graphql-sse-1.0.6" - sources."graphql-ws-5.5.5" + sources."graphql-ws-5.6.2" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -98088,7 +98835,7 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" - sources."meros-1.1.4" + sources."meros-1.2.0" sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.4.1" @@ -98315,10 +99062,10 @@ in meshcommander = nodeEnv.buildNodePackage { name = "meshcommander"; packageName = "meshcommander"; - version = "0.9.2-b"; + version = "0.9.3-b"; src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.2-b.tgz"; - sha512 = "aTPHEnqnIDzsCcL7O7FPnMmKN0Z9Sy5rl58atknikYbLISiu3LHESWUFvFGHHodSs0NVCGM/m5OR5BIVWYxnMg=="; + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.3-b.tgz"; + sha512 = "RNWHDlBCihL4v/BbqmcyqB3mui8qcza28Vp29FZL7j9d0y4u1UJyjtoHEwjOHw76gX6IMYKcLPksUo5cLDJcEw=="; }; dependencies = [ sources."accepts-1.3.8" @@ -98509,7 +99256,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.3" + sources."systeminformation-5.11.6" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -98728,7 +99475,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99129,7 +99876,7 @@ in sources."graceful-fs-4.2.9" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99407,7 +100154,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -99495,7 +100242,7 @@ in sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-1.18.1" @@ -99712,7 +100459,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1077.0" + sources."aws-sdk-2.1084.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99916,7 +100663,7 @@ in sources."jmp-2.0.0" sources."jp-kernel-2.0.0" sources."nan-2.14.2" - sources."nel-1.2.0" + sources."nel-1.3.0" sources."node-gyp-build-4.3.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" @@ -100254,7 +101001,7 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.13" + sources."@types/jquery-3.5.14" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" @@ -100283,7 +101030,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.31.1" + sources."jquery.terminal-2.32.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -100322,10 +101069,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.1.tgz"; - sha512 = "fbyGBN90QJX4cRkCQtxWltYp/8c/0QCPZrHCQmZJX9iGN91bq/QmggjPbh5/jdHB6johHGxB/LamJIyFFwOVxQ=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.2.tgz"; + sha512 = "u7n8UdvFlZcE8LpGDPpc2miBD0zOd9fBMKajeF04KkVCOX7s6Ua+qK9r+zvQBjQT53O7p9XGSEVAUvB4q98b5w=="; }; dependencies = [ sources."@bmewburn/js-beautify-1.13.0" @@ -100492,7 +101239,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" @@ -100502,7 +101249,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."vscode-html-languageservice-4.2.1" // { + (sources."vscode-html-languageservice-4.2.2" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -100596,7 +101343,7 @@ in sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."diff-4.0.2" (sources."duplexer2-0.1.4" // { dependencies = [ @@ -100647,8 +101394,8 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" - sources."http-errors-1.8.1" + sources."has-symbols-1.0.3" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -100746,7 +101493,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" @@ -100776,7 +101523,7 @@ in sources."source-map-0.6.1" sources."split2-3.2.2" sources."ssh-config-1.1.6" - sources."statuses-1.5.0" + sources."statuses-2.0.1" (sources."stream-combiner2-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -100845,91 +101592,72 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "11.0.1"; + version = "14.0.1"; src = fetchurl { - name = "iosevka-11.0.1.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v11.0.1"; - sha256 = "5f19c33cf90a4d4b0e6b14aa5866a81fa724042e934811b618d5f4e74e310043"; + name = "iosevka-14.0.1.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v14.0.1"; + sha256 = "f17c312d63df74a34f3a72b52f4ceff39e708a6ba674e5605bcadbf7e1e2c2f7"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.3.3" - sources."@ot-builder/bin-util-1.3.3" - (sources."@ot-builder/cli-help-shower-1.3.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@ot-builder/cli-proc-1.3.3" - sources."@ot-builder/cli-shared-1.3.3" - sources."@ot-builder/common-impl-1.3.3" - sources."@ot-builder/errors-1.3.3" - sources."@ot-builder/io-bin-cff-1.3.3" - sources."@ot-builder/io-bin-encoding-1.3.3" - sources."@ot-builder/io-bin-ext-private-1.3.3" - sources."@ot-builder/io-bin-font-1.3.3" - sources."@ot-builder/io-bin-glyph-store-1.3.3" - sources."@ot-builder/io-bin-layout-1.3.3" - sources."@ot-builder/io-bin-metadata-1.3.3" - sources."@ot-builder/io-bin-metric-1.3.3" - sources."@ot-builder/io-bin-name-1.3.3" - sources."@ot-builder/io-bin-sfnt-1.3.3" - sources."@ot-builder/io-bin-ttf-1.3.3" - sources."@ot-builder/io-bin-vtt-private-1.3.3" - sources."@ot-builder/ot-1.3.3" - sources."@ot-builder/ot-encoding-1.3.3" - sources."@ot-builder/ot-ext-private-1.3.3" - sources."@ot-builder/ot-glyphs-1.3.3" - sources."@ot-builder/ot-layout-1.3.3" - sources."@ot-builder/ot-metadata-1.3.3" - sources."@ot-builder/ot-name-1.3.3" - sources."@ot-builder/ot-sfnt-1.3.3" - sources."@ot-builder/ot-standard-glyph-namer-1.3.3" - sources."@ot-builder/ot-vtt-private-1.3.3" - sources."@ot-builder/prelude-1.3.3" - sources."@ot-builder/primitive-1.3.3" - sources."@ot-builder/rectify-1.3.3" - sources."@ot-builder/stat-glyphs-1.3.3" - sources."@ot-builder/trace-1.3.3" - sources."@ot-builder/var-store-1.3.3" - sources."@ot-builder/variance-1.3.3" - sources."@unicode/unicode-13.0.0-1.2.1" + sources."@ot-builder/bin-composite-types-1.4.0" + sources."@ot-builder/bin-util-1.4.0" + sources."@ot-builder/cli-help-shower-1.4.0" + sources."@ot-builder/cli-proc-1.4.0" + sources."@ot-builder/cli-shared-1.4.0" + sources."@ot-builder/common-impl-1.4.0" + sources."@ot-builder/errors-1.4.0" + sources."@ot-builder/io-bin-cff-1.4.0" + sources."@ot-builder/io-bin-encoding-1.4.0" + sources."@ot-builder/io-bin-ext-private-1.4.0" + sources."@ot-builder/io-bin-font-1.4.0" + sources."@ot-builder/io-bin-glyph-store-1.4.0" + sources."@ot-builder/io-bin-layout-1.4.0" + sources."@ot-builder/io-bin-metadata-1.4.0" + sources."@ot-builder/io-bin-metric-1.4.0" + sources."@ot-builder/io-bin-name-1.4.0" + sources."@ot-builder/io-bin-sfnt-1.4.0" + sources."@ot-builder/io-bin-ttf-1.4.0" + sources."@ot-builder/io-bin-vtt-private-1.4.0" + sources."@ot-builder/ot-1.4.0" + sources."@ot-builder/ot-encoding-1.4.0" + sources."@ot-builder/ot-ext-private-1.4.0" + sources."@ot-builder/ot-glyphs-1.4.0" + sources."@ot-builder/ot-layout-1.4.0" + sources."@ot-builder/ot-metadata-1.4.0" + sources."@ot-builder/ot-name-1.4.0" + sources."@ot-builder/ot-sfnt-1.4.0" + sources."@ot-builder/ot-standard-glyph-namer-1.4.0" + sources."@ot-builder/ot-vtt-private-1.4.0" + sources."@ot-builder/prelude-1.4.0" + sources."@ot-builder/primitive-1.4.0" + sources."@ot-builder/rectify-1.4.0" + sources."@ot-builder/stat-glyphs-1.4.0" + sources."@ot-builder/trace-1.4.0" + sources."@ot-builder/var-store-1.4.0" + sources."@ot-builder/variance-1.4.0" + sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."async-0.9.2" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" sources."chainsaw-0.0.9" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."cldr-7.1.1" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-7.0.4" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."concat-map-0.0.1" - sources."css-3.0.0" - sources."debug-3.1.0" - sources."decode-uri-component-0.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."deep-is-0.1.4" - sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" (sources."escope-1.0.3" // { dependencies = [ @@ -100958,37 +101686,26 @@ in sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" - sources."filelist-1.0.2" - sources."fs-extra-10.0.0" - sources."fs.realpath-1.0.0" + sources."fs-extra-10.0.1" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" sources."graceful-fs-4.2.9" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jake-10.8.2" sources."jsonfile-6.1.0" sources."levn-0.3.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.3.3" - sources."otb-ttc-bundle-1.3.3" + sources."ot-builder-1.4.0" + sources."otb-ttc-bundle-1.4.0" sources."passerror-1.1.1" - sources."patel-0.35.1" - sources."path-is-absolute-1.0.1" - sources."patrisika-0.23.0" + sources."patel-0.37.1" + sources."patrisika-0.24.0" sources."patrisika-scopes-0.12.0" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" @@ -100996,7 +101713,6 @@ in sources."restore-cursor-3.1.0" sources."resumer-0.0.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" (sources."semver-7.3.5" // { dependencies = [ @@ -101006,17 +101722,10 @@ in sources."seq-0.3.5" sources."signal-exit-3.0.7" sources."source-map-0.6.1" - sources."source-map-resolve-0.6.0" sources."spiro-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - (sources."stylus-0.55.0" // { - dependencies = [ - sources."semver-6.3.0" - sources."source-map-0.7.3" - ]; - }) - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" @@ -101027,28 +101736,15 @@ in sources."universalify-2.0.0" (sources."verda-1.5.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."wawoff2-2.0.1" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" + sources."wrap-ansi-7.0.0" sources."xpath-0.0.32" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -101196,11 +101892,21 @@ in sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/crc32c-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/ie11-detection-2.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/sha1-browser-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/sha256-browser-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101221,65 +101927,65 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.52.0" + sources."@aws-sdk/abort-controller-3.53.0" sources."@aws-sdk/chunked-blob-reader-3.52.0" sources."@aws-sdk/chunked-blob-reader-native-3.52.0" - sources."@aws-sdk/client-s3-3.52.0" - sources."@aws-sdk/client-sso-3.52.0" - sources."@aws-sdk/client-sts-3.52.0" - sources."@aws-sdk/config-resolver-3.52.0" - sources."@aws-sdk/credential-provider-env-3.52.0" - sources."@aws-sdk/credential-provider-imds-3.52.0" - sources."@aws-sdk/credential-provider-ini-3.52.0" - sources."@aws-sdk/credential-provider-node-3.52.0" - sources."@aws-sdk/credential-provider-process-3.52.0" - sources."@aws-sdk/credential-provider-sso-3.52.0" - sources."@aws-sdk/credential-provider-web-identity-3.52.0" - sources."@aws-sdk/eventstream-marshaller-3.52.0" - sources."@aws-sdk/eventstream-serde-browser-3.52.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.52.0" - sources."@aws-sdk/eventstream-serde-node-3.52.0" - sources."@aws-sdk/eventstream-serde-universal-3.52.0" - sources."@aws-sdk/fetch-http-handler-3.52.0" - sources."@aws-sdk/hash-blob-browser-3.52.0" - sources."@aws-sdk/hash-node-3.52.0" - sources."@aws-sdk/hash-stream-node-3.52.0" - sources."@aws-sdk/invalid-dependency-3.52.0" + sources."@aws-sdk/client-s3-3.53.1" + sources."@aws-sdk/client-sso-3.53.0" + sources."@aws-sdk/client-sts-3.53.0" + sources."@aws-sdk/config-resolver-3.53.0" + sources."@aws-sdk/credential-provider-env-3.53.0" + sources."@aws-sdk/credential-provider-imds-3.53.0" + sources."@aws-sdk/credential-provider-ini-3.53.0" + sources."@aws-sdk/credential-provider-node-3.53.0" + sources."@aws-sdk/credential-provider-process-3.53.0" + sources."@aws-sdk/credential-provider-sso-3.53.0" + sources."@aws-sdk/credential-provider-web-identity-3.53.0" + sources."@aws-sdk/eventstream-marshaller-3.53.0" + sources."@aws-sdk/eventstream-serde-browser-3.53.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.53.0" + sources."@aws-sdk/eventstream-serde-node-3.53.0" + sources."@aws-sdk/eventstream-serde-universal-3.53.0" + sources."@aws-sdk/fetch-http-handler-3.53.0" + sources."@aws-sdk/hash-blob-browser-3.53.0" + sources."@aws-sdk/hash-node-3.53.0" + sources."@aws-sdk/hash-stream-node-3.53.1" + sources."@aws-sdk/invalid-dependency-3.53.0" sources."@aws-sdk/is-array-buffer-3.52.0" - sources."@aws-sdk/md5-js-3.52.0" - sources."@aws-sdk/middleware-apply-body-checksum-3.52.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.52.0" - sources."@aws-sdk/middleware-content-length-3.52.0" - sources."@aws-sdk/middleware-expect-continue-3.52.0" - sources."@aws-sdk/middleware-header-default-3.52.0" - sources."@aws-sdk/middleware-host-header-3.52.0" - sources."@aws-sdk/middleware-location-constraint-3.52.0" - sources."@aws-sdk/middleware-logger-3.52.0" - (sources."@aws-sdk/middleware-retry-3.52.0" // { + sources."@aws-sdk/md5-js-3.53.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.53.0" + sources."@aws-sdk/middleware-content-length-3.53.0" + sources."@aws-sdk/middleware-expect-continue-3.53.0" + sources."@aws-sdk/middleware-flexible-checksums-3.53.0" + sources."@aws-sdk/middleware-header-default-3.53.0" + sources."@aws-sdk/middleware-host-header-3.53.0" + sources."@aws-sdk/middleware-location-constraint-3.53.0" + sources."@aws-sdk/middleware-logger-3.53.0" + (sources."@aws-sdk/middleware-retry-3.53.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.52.0" - sources."@aws-sdk/middleware-sdk-sts-3.52.0" - sources."@aws-sdk/middleware-serde-3.52.0" - sources."@aws-sdk/middleware-signing-3.52.0" - sources."@aws-sdk/middleware-ssec-3.52.0" - sources."@aws-sdk/middleware-stack-3.52.0" - sources."@aws-sdk/middleware-user-agent-3.52.0" - sources."@aws-sdk/node-config-provider-3.52.0" - sources."@aws-sdk/node-http-handler-3.52.0" - sources."@aws-sdk/property-provider-3.52.0" - sources."@aws-sdk/protocol-http-3.52.0" - sources."@aws-sdk/querystring-builder-3.52.0" - sources."@aws-sdk/querystring-parser-3.52.0" - sources."@aws-sdk/s3-request-presigner-3.52.0" - sources."@aws-sdk/service-error-classification-3.52.0" + sources."@aws-sdk/middleware-sdk-s3-3.53.0" + sources."@aws-sdk/middleware-sdk-sts-3.53.0" + sources."@aws-sdk/middleware-serde-3.53.0" + sources."@aws-sdk/middleware-signing-3.53.0" + sources."@aws-sdk/middleware-ssec-3.53.0" + sources."@aws-sdk/middleware-stack-3.53.0" + sources."@aws-sdk/middleware-user-agent-3.53.0" + sources."@aws-sdk/node-config-provider-3.53.0" + sources."@aws-sdk/node-http-handler-3.53.0" + sources."@aws-sdk/property-provider-3.53.0" + sources."@aws-sdk/protocol-http-3.53.0" + sources."@aws-sdk/querystring-builder-3.53.0" + sources."@aws-sdk/querystring-parser-3.53.0" + sources."@aws-sdk/s3-request-presigner-3.53.1" + sources."@aws-sdk/service-error-classification-3.53.0" sources."@aws-sdk/shared-ini-file-loader-3.52.0" - sources."@aws-sdk/signature-v4-3.52.0" - sources."@aws-sdk/smithy-client-3.52.0" - sources."@aws-sdk/types-3.52.0" - sources."@aws-sdk/url-parser-3.52.0" + sources."@aws-sdk/signature-v4-3.53.0" + sources."@aws-sdk/smithy-client-3.53.0" + sources."@aws-sdk/types-3.53.0" + sources."@aws-sdk/url-parser-3.53.0" sources."@aws-sdk/util-arn-parser-3.52.0" sources."@aws-sdk/util-base64-browser-3.52.0" sources."@aws-sdk/util-base64-node-3.52.0" @@ -101287,19 +101993,21 @@ in sources."@aws-sdk/util-body-length-node-3.52.0" sources."@aws-sdk/util-buffer-from-3.52.0" sources."@aws-sdk/util-config-provider-3.52.0" - sources."@aws-sdk/util-create-request-3.52.0" - sources."@aws-sdk/util-credentials-3.52.0" - sources."@aws-sdk/util-defaults-mode-browser-3.52.0" - sources."@aws-sdk/util-defaults-mode-node-3.52.0" - sources."@aws-sdk/util-format-url-3.52.0" + sources."@aws-sdk/util-create-request-3.53.0" + sources."@aws-sdk/util-credentials-3.53.0" + sources."@aws-sdk/util-defaults-mode-browser-3.53.0" + sources."@aws-sdk/util-defaults-mode-node-3.53.0" + sources."@aws-sdk/util-format-url-3.53.0" sources."@aws-sdk/util-hex-encoding-3.52.0" sources."@aws-sdk/util-locate-window-3.52.0" + sources."@aws-sdk/util-stream-browser-3.53.0" + sources."@aws-sdk/util-stream-node-3.53.0" sources."@aws-sdk/util-uri-escape-3.52.0" - sources."@aws-sdk/util-user-agent-browser-3.52.0" - sources."@aws-sdk/util-user-agent-node-3.52.0" + sources."@aws-sdk/util-user-agent-browser-3.53.0" + sources."@aws-sdk/util-user-agent-node-3.53.0" sources."@aws-sdk/util-utf8-browser-3.52.0" sources."@aws-sdk/util-utf8-node-3.52.0" - sources."@aws-sdk/util-waiter-3.52.0" + sources."@aws-sdk/util-waiter-3.53.0" sources."@aws-sdk/xml-builder-3.52.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" @@ -101307,7 +102015,7 @@ in sources."@joplin/fork-sax-1.2.43" (sources."@joplin/htmlpack-2.6.1" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."@joplin/lib-2.6.3" @@ -101360,7 +102068,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1084.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -102014,7 +102722,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -102305,7 +103013,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -102559,7 +103267,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -103194,7 +103902,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -103202,7 +103910,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.27.3" // { + (sources."@putdotio/api-client-8.29.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103292,7 +104000,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -103426,17 +104134,18 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.16"; + version = "6.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz"; - sha512 = "nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz"; + sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -103452,7 +104161,6 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.4.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."connect-3.7.0" @@ -103468,7 +104176,7 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103484,7 +104192,7 @@ in sources."finalhandler-1.1.2" sources."flatted-3.2.5" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" @@ -103597,7 +104305,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -103617,7 +104325,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -103756,7 +104464,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -103809,7 +104517,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -104050,7 +104758,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -104772,7 +105480,7 @@ in sources."abbrev-1.1.1" sources."add-stream-1.0.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -104965,7 +105673,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.1.0" @@ -105309,7 +106017,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -106300,7 +107008,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -106310,7 +107018,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -106333,7 +107041,7 @@ in sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -106425,7 +107133,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -106721,7 +107429,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106852,7 +107560,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -107459,7 +108167,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107845,11 +108553,11 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { + "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { name = "markdown-preview-vim"; packageName = "markdown-preview-vim"; version = "0.0.1"; - src = ../../misc/vim-plugins/markdown-preview-nvim; + src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."accepts-1.3.8" sources."after-0.8.2" @@ -108112,7 +108820,7 @@ in sources."interpret-1.4.0" sources."is-core-module-2.8.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" @@ -108326,7 +109034,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108457,7 +109165,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.3.2" + sources."puppeteer-13.4.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -108621,7 +109329,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -108801,7 +109509,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-17.0.18" + sources."@types/node-17.0.21" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" @@ -109184,26 +109892,30 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.4.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."cacache-15.3.0" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-support-1.1.3" @@ -109218,12 +109930,12 @@ in sources."err-code-2.0.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -109236,8 +109948,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" + sources."lru-cache-7.4.0" + sources."make-fetch-happen-10.0.3" sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -109261,7 +109973,11 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.5" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -109734,12 +110450,12 @@ in sources."@node-red/registry-2.2.2" sources."@node-red/runtime-2.2.2" sources."@node-red/util-2.2.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -109986,7 +110702,7 @@ in sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.0.1" - (sources."number-allocator-1.0.9" // { + (sources."number-allocator-1.0.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -110492,7 +111208,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110802,7 +111518,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."type-fest-0.20.2" ]; }) @@ -110986,10 +111702,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.5.1"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.5.1.tgz"; - sha512 = "zHrOHAatEPJ59o2JIPlhgc9LX9mb8xFrqu4kiiul4w1IGMTtKn2lqRiGIRKU0or69NSLXNmqbCP9bNJIr/wB6Q=="; + url = "https://registry.npmjs.org/npm/-/npm-8.5.2.tgz"; + sha512 = "fQRPOSrQfO3AG1JEOgScVrYhOfprZbhSKAjY4goESGPKMflWHxyQt8djo6EZhNjxCNIUAPtT75hkCN902SeYAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -111004,10 +111720,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.3.1"; + version = "12.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.3.1.tgz"; - sha512 = "rvXyiUnc9zw3WXakqv0LsdFDc1V4T8DHG8AdWEjJiqfOZdBI4q8ekTt/BFqLQAtcXo5Pu6WGqjA9oDnFi4UV3g=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.0.tgz"; + sha512 = "nrryXO9IZdJsAIXo8LdtllrsGiTDE4IMAod7fl1jd5C38tOdZZG/crNNii4IkctxltQRmK/ziZwsMDTlhszZXg=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -111017,20 +111733,20 @@ in sources."@npmcli/fs-1.1.1" (sources."@npmcli/git-3.0.0" // { dependencies = [ - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.0" ]; }) sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" + sources."@npmcli/run-script-3.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -111095,7 +111811,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" (sources."glob-7.2.0" // { @@ -111185,7 +111901,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mimic-response-1.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" @@ -111212,7 +111928,7 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.0" sources."make-fetch-happen-10.0.3" ]; }) @@ -111228,7 +111944,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-13.0.2" + sources."pacote-13.0.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -111403,7 +112119,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -111649,7 +112365,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -111663,7 +112379,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -111681,7 +112397,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -112015,7 +112731,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.71" + sources."electron-to-chromium-1.4.75" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -112099,7 +112815,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -112122,10 +112838,11 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ + sources."acorn-8.7.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.10.0" + sources."terser-5.12.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -112652,6 +113369,243 @@ in bypassCache = true; reconstructLock = true; }; + parcel = nodeEnv.buildNodePackage { + name = "parcel"; + packageName = "parcel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parcel/-/parcel-2.3.2.tgz"; + sha512 = "4jhgoBcQaiGKmnmBvNyKyOvZrxCgzgUzdEoVup/fRCOP99hNmvYIN5IErIIJxsU9ObcG/RGCFF8wa4kVRsWfIg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@parcel/bundler-default-2.3.2" + sources."@parcel/cache-2.3.2" + sources."@parcel/codeframe-2.3.2" + sources."@parcel/compressor-raw-2.3.2" + sources."@parcel/config-default-2.3.2" + sources."@parcel/core-2.3.2" + sources."@parcel/diagnostic-2.3.2" + sources."@parcel/events-2.3.2" + sources."@parcel/fs-2.3.2" + sources."@parcel/fs-search-2.3.2" + sources."@parcel/graph-2.3.2" + sources."@parcel/hash-2.3.2" + sources."@parcel/logger-2.3.2" + sources."@parcel/markdown-ansi-2.3.2" + sources."@parcel/namer-default-2.3.2" + sources."@parcel/node-resolver-core-2.3.2" + sources."@parcel/optimizer-cssnano-2.3.2" + sources."@parcel/optimizer-htmlnano-2.3.2" + sources."@parcel/optimizer-image-2.3.2" + sources."@parcel/optimizer-svgo-2.3.2" + sources."@parcel/optimizer-terser-2.3.2" + sources."@parcel/package-manager-2.3.2" + sources."@parcel/packager-css-2.3.2" + sources."@parcel/packager-html-2.3.2" + sources."@parcel/packager-js-2.3.2" + sources."@parcel/packager-raw-2.3.2" + sources."@parcel/packager-svg-2.3.2" + sources."@parcel/plugin-2.3.2" + sources."@parcel/reporter-cli-2.3.2" + sources."@parcel/reporter-dev-server-2.3.2" + sources."@parcel/resolver-default-2.3.2" + sources."@parcel/runtime-browser-hmr-2.3.2" + sources."@parcel/runtime-js-2.3.2" + sources."@parcel/runtime-react-refresh-2.3.2" + sources."@parcel/runtime-service-worker-2.3.2" + sources."@parcel/source-map-2.0.2" + sources."@parcel/transformer-babel-2.3.2" + sources."@parcel/transformer-css-2.3.2" + (sources."@parcel/transformer-html-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-image-2.3.2" + sources."@parcel/transformer-js-2.3.2" + sources."@parcel/transformer-json-2.3.2" + sources."@parcel/transformer-postcss-2.3.2" + (sources."@parcel/transformer-posthtml-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-raw-2.3.2" + sources."@parcel/transformer-react-refresh-wrap-2.3.2" + (sources."@parcel/transformer-svg-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/types-2.3.2" + sources."@parcel/utils-2.3.2" + sources."@parcel/watcher-2.0.5" + sources."@parcel/workers-2.3.2" + sources."@swc/helpers-0.2.14" + sources."@trysound/sax-0.2.0" + sources."@types/parse-json-4.0.0" + sources."abortcontroller-polyfill-1.7.3" + sources."acorn-8.7.0" + sources."ansi-styles-3.2.1" + sources."base-x-3.0.9" + sources."boolbase-1.0.0" + sources."browserslist-4.19.3" + sources."buffer-from-1.1.2" + sources."callsites-3.1.0" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001312" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chrome-trace-event-1.0.3" + sources."clone-2.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colord-2.9.2" + sources."commander-7.2.0" + sources."cosmiconfig-7.0.1" + sources."css-declaration-sorter-6.1.4" + sources."css-select-4.2.1" + sources."css-tree-1.1.3" + sources."css-what-5.1.0" + sources."cssesc-3.0.0" + sources."cssnano-5.1.0" + sources."cssnano-preset-default-5.2.0" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" + sources."detect-libc-1.0.3" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.3.0" + sources."domutils-2.8.0" + sources."dotenv-7.0.0" + sources."dotenv-expand-5.1.0" + sources."electron-to-chromium-1.4.75" + sources."entities-2.2.0" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."get-port-4.2.0" + sources."globals-13.12.1" + sources."has-flag-3.0.0" + sources."htmlnano-2.0.0" + (sources."htmlparser2-7.2.0" // { + dependencies = [ + sources."entities-3.0.1" + ]; + }) + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-json-2.0.1" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json-source-map-0.6.1" + sources."json5-2.2.0" + sources."lilconfig-2.0.4" + sources."lines-and-columns-1.2.4" + sources."lmdb-2.2.3" + sources."lodash.memoize-4.1.2" + sources."lodash.uniq-4.5.0" + sources."mdn-data-2.0.14" + sources."minimist-1.2.5" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" + sources."nan-2.15.0" + sources."nanoid-3.3.1" + sources."node-addon-api-3.2.1" + sources."node-gyp-build-4.3.0" + sources."node-releases-2.0.2" + sources."normalize-url-6.1.0" + sources."nth-check-2.0.1" + sources."nullthrows-1.1.1" + sources."ordered-binary-1.2.4" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-type-4.0.0" + sources."picocolors-1.0.0" + sources."postcss-8.4.7" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.0" + sources."postcss-discard-comments-5.1.0" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-discard-empty-5.1.0" + sources."postcss-discard-overridden-5.1.0" + sources."postcss-merge-longhand-5.1.0" + sources."postcss-merge-rules-5.1.0" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.0" + sources."postcss-minify-params-5.1.0" + sources."postcss-minify-selectors-5.2.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.0" + sources."postcss-normalize-repeat-style-5.1.0" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.0" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.0" + sources."postcss-ordered-values-5.1.0" + sources."postcss-reduce-initial-5.1.0" + sources."postcss-reduce-transforms-5.1.0" + sources."postcss-selector-parser-6.0.9" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.0" + sources."postcss-value-parser-4.2.0" + sources."posthtml-0.16.6" + sources."posthtml-parser-0.11.0" + sources."posthtml-render-3.0.0" + sources."react-refresh-0.9.0" + sources."regenerator-runtime-0.13.9" + sources."resolve-from-4.0.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + sources."stable-0.1.8" + sources."stylehacks-5.1.0" + sources."supports-color-5.5.0" + sources."svgo-2.8.0" + (sources."terser-5.12.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.7.3" + ]; + }) + sources."timsort-0.3.0" + sources."type-fest-0.20.2" + sources."util-deprecate-1.0.2" + sources."utility-types-3.10.0" + sources."v8-compile-cache-2.3.0" + sources."weak-lru-cache-1.2.2" + sources."xxhash-wasm-0.4.2" + sources."yaml-1.10.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Blazing fast, zero configuration web application bundler"; + homepage = "https://github.com/parcel-bundler/parcel#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; @@ -112771,7 +113725,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -112902,7 +113856,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -113117,7 +114071,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" @@ -113975,7 +114929,7 @@ in sources."debug-4.3.3" sources."deep-is-0.1.4" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" @@ -114003,7 +114957,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -114064,7 +115018,7 @@ in sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" @@ -114089,11 +115043,11 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.1.2" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.3" + sources."systeminformation-5.11.6" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -114108,7 +115062,7 @@ in sources."async-2.6.3" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -114129,10 +115083,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.31.0"; + version = "6.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.31.0.tgz"; - sha512 = "YUCyLI2J2wQsHWgcRYR8wUrTWsE0E8GX46XKtdXcUiE0GJJYi5saRy2Y8BMfLtlDHshHLs2U/KO1e5gsftJTFA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.2.tgz"; + sha512 = "uPZDMVfB4SEygvfUJHBTNXUCrMCxkXV5QHaoEURCeHP5GDojKH21L1Onk2Qft+kYBmLCmipV3JCGfojSQV3epw=="; }; buildInputs = globalBuildInputs; meta = { @@ -114175,10 +115129,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.6"; + version = "8.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; - sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz"; + sha512 = "L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A=="; }; dependencies = [ sources."nanoid-3.3.1" @@ -114224,7 +115178,7 @@ in sources."fast-glob-3.2.11" sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" @@ -114265,7 +115219,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -114406,13 +115360,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.9.2.tgz"; - sha512 = "i9eK6cexV74OgeWaH3+e6S07kvC9jEZTl6BqtBH398nlCU0tck7mE9dicY6YQd+euvMjjCtY89q4NgmaPnUsSg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.10.0.tgz"; + sha512 = "dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; dependencies = [ - sources."@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" ]; buildInputs = globalBuildInputs; meta = { @@ -114427,13 +115381,13 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.9.2.tgz"; - sha512 = "lAe5mPD18PPpVlVmHQqj2ky11N9n6nGI32vuu2RbLHK4mRgkA/sLn8kBg81zs3WIdBLzCX+dYSpM8UFviZrlgA=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.10.0.tgz"; + sha512 = "PDapBurrv72Mn28rWg5cWZrt6cFLftWadNfdbVNmsjdR4G3eX9OrflSsOVEuSOANLrP/yi129zT0hS+XC6P3Wg=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" sources."@types/js-levenshtein-1.1.1" sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -114791,11 +115745,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - sources."vscode-languageserver-protocol-3.17.0-next.14" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + sources."vscode-languageserver-protocol-3.17.0-next.15" sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -114879,14 +115833,14 @@ in sources."duplexer3-0.1.4" sources."end-of-stream-1.4.4" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" sources."ini-1.3.8" @@ -114953,10 +115907,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.222"; + version = "1.1.226"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.222.tgz"; - sha512 = "zEQyvkQa/hUmjg5A7COOzE/uL3W6D/Fp6qjhE+HDeLKwe+zm1KSMo74djIn0CTzhK53bmEDgEIR1hoMpA/Is/w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.226.tgz"; + sha512 = "ZJx3Kz5v7hc6DIeIVSC3zeCia43rlLD+IK8ip5k+h3gTlIQodaf/zccsCh2xmoBvCTY9VbbbLnDbkITyIW3+MA=="; }; buildInputs = globalBuildInputs; meta = { @@ -115233,7 +116187,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."i-0.3.7" sources."inflight-1.0.6" @@ -115314,7 +116268,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -115330,7 +116284,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -115344,7 +116298,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -115362,7 +116316,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-default-from-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" @@ -115454,7 +116408,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -115874,7 +116828,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116058,7 +117012,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -116213,7 +117167,6 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" - sources."json3-3.3.3" sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."keyv-3.0.0" @@ -116273,8 +117226,12 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -116764,7 +117721,7 @@ in ]; }) sources."sockjs-0.3.24" - (sources."sockjs-client-1.5.2" // { + (sources."sockjs-client-1.6.0" // { dependencies = [ sources."debug-3.2.7" ]; @@ -116936,7 +117893,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.7" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -117219,7 +118176,7 @@ in sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117234,10 +118191,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.7.tgz"; - sha512 = "MkRGhBJfEESAhNnH+duJIkcS+PO5CRPzfJuHjd8tJEfdSXeCu+6UfBVyX4zrstbNGPtZkLn+ZV+bBl5obIcMIA=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.8.tgz"; + sha512 = "P0gh4cIP9KRMMISwVoU0EZKQS6U841UCZ26Lsoh3LANhgPGhKr5IrJzxVX7unxKLGzEjzZWXF778Vye9JXVDEg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -117266,7 +118223,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.82" + sources."@redocly/openapi-core-1.0.0-beta.85" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.18.12" @@ -117284,7 +118241,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-2.0.3" + sources."babel-plugin-styled-components-2.0.6" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -117415,7 +118372,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.4.1" + sources."mobx-6.4.2" sources."mobx-react-7.3.0" sources."mobx-react-lite-3.3.0" sources."ms-2.1.2" @@ -117431,7 +118388,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.2.0" + sources."openapi-sampler-1.2.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -117469,7 +118426,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.63" // { + (sources."redoc-2.0.0-rc.64" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -117509,7 +118466,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -117543,7 +118500,7 @@ in sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117699,10 +118656,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.2.1.tgz"; - sha512 = "OXH4qT5Gs9di6lZPDmRuanIvdiVzltCe8W9ELz6Q3EhoWS+RjRp5HBwFHr+k1fbbP82/Z83sQiK+/ZYFBwrrsQ=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.3.0.tgz"; + sha512 = "KzZxJjj1gmxVNyplY6g9MiGwtDvZJiYkMvG1Qmaita7vWT/8eoTEK+RuIPLvxDeyxOtTz56u2wrOETVO79qL4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -118040,10 +118997,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.67.3"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz"; - sha512 = "G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.69.0.tgz"; + sha512 = "kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -118058,11 +119015,11 @@ in bypassCache = true; reconstructLock = true; }; - "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { + "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; version = "0.2.834"; - src = ../../misc/vscode-extensions/rust-analyzer/build-deps; + src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" @@ -118116,7 +119073,7 @@ in sources."array-union-2.1.0" sources."astral-regex-2.0.0" sources."asynckit-0.4.0" - sources."azure-devops-node-api-11.1.0" + sources."azure-devops-node-api-11.1.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."big-integer-1.6.51" @@ -118315,7 +119272,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."he-1.2.0" sources."hosted-git-info-4.1.0" @@ -118503,7 +119460,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" @@ -118541,7 +119498,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -118570,7 +119527,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.6" + sources."postcss-8.4.7" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -118636,7 +119593,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-auth-2.0.7" sources."inherits-2.0.4" sources."isarray-0.0.1" @@ -118684,10 +119641,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.49.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118864,10 +119821,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.2.1"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.2.1.tgz"; - sha512 = "ocCfLKt+C8rZaalzkbdnxenPZBjS78wnZxJYqDdXx3EYr4e9KND2WyTKUhB8g/f3FPSWjGW35R9e3/Mfd/ceTw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.7.1.tgz"; + sha512 = "DIPgJ/jbWQpF1kyAhQR6b3Lqjq2Dwv/41D5UdNyMsnvV5eUOEm5pcCAQE7aT+N/rS8F1ez47iaZyi70esNe3PQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -118876,26 +119833,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@serverless/dashboard-plugin-6.1.0" + sources."@serverless/aws-lambda-otel-extension-dist-0.1.6" + sources."@serverless/dashboard-plugin-6.1.5" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.3.1" // { + (sources."@serverless/platform-client-4.3.2" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.0.2" // { + (sources."@serverless/utils-6.0.3" // { dependencies = [ sources."jwt-decode-3.1.2" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.178" - sources."@types/node-17.0.18" + sources."@types/lodash-4.14.179" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -118921,7 +119879,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1084.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -119012,7 +119970,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.10.7" + sources."dayjs-1.10.8" sources."debug-4.3.3" (sources."decompress-4.2.1" // { dependencies = [ @@ -119120,7 +120078,7 @@ in sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.0" @@ -119191,8 +120149,12 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" @@ -119310,7 +120272,7 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-regex-range-5.0.1" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -119988,10 +120950,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.855.0"; + version = "1.859.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.855.0.tgz"; - sha512 = "LZ8tXVleYHPW2GL3UWfaswKatNY1rTQ7aUNOD1rboD4cWydJsHCnSHzoMQcXq+06XBLw//LxL0G2YhdZhPz2mA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.859.0.tgz"; + sha512 = "myHCj1zbTV95ZfR+oVZRrOYJ65woMciR9tOVH+lVjZUs58kruH24bLiqxrd89BBLs+46PzowrOkFtJkdXNxuOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -120015,14 +120977,14 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.3" - sources."engine.io-6.1.2" + sources."engine.io-6.1.3" sources."engine.io-parser-5.0.3" sources."mime-db-1.51.0" sources."mime-types-2.1.34" @@ -120136,7 +121098,11 @@ in sources."ms-2.0.0" sources."normalize-package-data-3.0.3" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.0" + ]; + }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."parse-json-5.2.0" @@ -120171,7 +121137,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-indent-4.0.0" @@ -120310,6 +121276,7 @@ in sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" + sources."clarify-error-1.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -120471,7 +121438,7 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ @@ -120630,13 +121597,13 @@ in sources."moo-0.5.1" sources."ms-2.1.2" sources."multiblob-1.13.7" - sources."multiblob-http-1.2.0" + sources."multiblob-http-1.2.1" sources."multicb-1.2.2" sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" sources."mutexify-1.4.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -120726,7 +121693,7 @@ in sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" - sources."pull-abortable-4.0.0" + sources."pull-abortable-4.1.1" sources."pull-async-1.0.0" sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" @@ -120744,14 +121711,10 @@ in ]; }) sources."pull-glob-1.0.7" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" - sources."pull-inactivity-2.1.3" + sources."pull-inactivity-2.1.4" sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-looper-1.0.0" @@ -120791,7 +121754,6 @@ in sources."push-stream-11.0.1" ]; }) - sources."querystringify-2.2.0" sources."queue-tick-1.0.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" @@ -120888,7 +121850,6 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."requires-port-1.0.0" sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -120905,8 +121866,8 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.3" - sources."secret-handshake-1.1.20" - sources."secret-stack-6.4.0" + sources."secret-handshake-1.1.21" + sources."secret-stack-6.4.1" sources."semver-5.7.1" sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { @@ -120962,13 +121923,13 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.4" // { + (sources."ssb-bendy-butt-0.12.5" // { dependencies = [ sources."ssb-keys-8.2.0" ]; }) - sources."ssb-bfe-3.1.1" - sources."ssb-bfe-spec-0.3.0" + sources."ssb-bfe-3.1.3" + sources."ssb-bfe-spec-0.4.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" @@ -120978,7 +121939,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.9" // { + (sources."ssb-db2-2.8.10" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -121034,7 +121995,7 @@ in sources."ssb-replicate-1.3.3" sources."ssb-typescript-2.6.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.7.0" + sources."ssb-uri2-1.7.1" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -121128,7 +122089,6 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" - sources."url-parse-1.5.7" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -121247,7 +122207,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1084.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121476,7 +122436,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" @@ -121512,7 +122472,7 @@ in ]; }) sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-promise-2.2.2" sources."is-property-1.0.2" @@ -122025,10 +122985,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.5.1"; + version = "14.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.1.tgz"; - sha512 = "8Hf4HtnhxlWlf7iXF9zFfhSc3X0teRnVzl6PqPs2JEFx+dy/mhMhghZfiTDW4QG0ihDw9+WP7GZw5Nzx7cQF5A=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz"; + sha512 = "omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -122156,7 +123116,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.7" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -122388,7 +123348,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122443,9 +123403,9 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."to-regex-range-5.0.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -122473,7 +123433,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122532,11 +123492,11 @@ in sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."svelte-3.46.4" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ @@ -122833,7 +123793,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -123193,7 +124153,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -123336,7 +124296,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.7" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.3" sources."postcss-nested-5.0.6" @@ -123569,12 +124529,13 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; dependencies = [ + sources."acorn-8.7.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" @@ -123597,34 +124558,34 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.1.0.tgz"; - sha512 = "VZ0iVepE0jUchMfIW0uKGdEdv3l0ajOFvUBcpB1xGOLAz3gVwpdWvlagVlFXuwjc2N+9mcjTM0PCIXNwIs2vQA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.1.1.tgz"; + sha512 = "AoE/pPL+6e/7hHOxwxL5oBTYIsG6gjrMP77VQZVYxXYfTDduwRlqhQUUrVd32DaLQTm7z3/lCnY46uFkmK06fA=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.1.0" - sources."@textlint/ast-tester-12.1.0" - sources."@textlint/ast-traverse-12.1.0" - sources."@textlint/feature-flag-12.1.0" - sources."@textlint/fixer-formatter-12.1.0" - sources."@textlint/kernel-12.1.0" - sources."@textlint/linter-formatter-12.1.0" - sources."@textlint/markdown-to-ast-12.1.0" - sources."@textlint/module-interop-12.1.0" - sources."@textlint/source-code-fixer-12.1.0" - sources."@textlint/text-to-ast-12.1.0" - sources."@textlint/textlint-plugin-markdown-12.1.0" - sources."@textlint/textlint-plugin-text-12.1.0" - sources."@textlint/types-12.1.0" - sources."@textlint/utils-12.1.0" + sources."@textlint/ast-node-types-12.1.1" + sources."@textlint/ast-tester-12.1.1" + sources."@textlint/ast-traverse-12.1.1" + sources."@textlint/feature-flag-12.1.1" + sources."@textlint/fixer-formatter-12.1.1" + sources."@textlint/kernel-12.1.1" + sources."@textlint/linter-formatter-12.1.1" + sources."@textlint/markdown-to-ast-12.1.1" + sources."@textlint/module-interop-12.1.1" + sources."@textlint/source-code-fixer-12.1.1" + sources."@textlint/text-to-ast-12.1.1" + sources."@textlint/textlint-plugin-markdown-12.1.1" + sources."@textlint/textlint-plugin-text-12.1.1" + sources."@textlint/types-12.1.1" + sources."@textlint/utils-12.1.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.10.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" @@ -123633,16 +124594,11 @@ in sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" sources."ccount-1.1.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."chalk-4.1.2" sources."character-entities-1.2.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charenc-0.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" @@ -123654,7 +124610,7 @@ in sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" @@ -123672,8 +124628,8 @@ in sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-symbols-1.0.2" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" @@ -123687,7 +124643,7 @@ in sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" sources."is-regex-1.1.4" @@ -123700,7 +124656,6 @@ in sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { @@ -123708,11 +124663,7 @@ in sources."is-buffer-1.1.6" ]; }) - (sources."mdast-util-find-and-replace-1.1.1" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."mdast-util-find-and-replace-1.1.1" sources."mdast-util-footnote-0.1.7" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-frontmatter-0.2.0" @@ -123737,7 +124688,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" @@ -123780,37 +124730,19 @@ in sources."resolve-1.22.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."slice-ansi-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."structured-source-3.0.2" - sources."supports-color-2.0.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."table-6.8.0" sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trough-1.0.5" @@ -123877,7 +124809,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.4.1" @@ -124492,7 +125424,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124602,7 +125534,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124680,7 +125612,7 @@ in sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124689,7 +125621,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -124838,7 +125770,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125153,7 +126085,7 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -125162,7 +126094,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -125311,7 +126243,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125803,7 +126735,7 @@ in sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" @@ -126304,7 +127236,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -126769,7 +127701,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -127618,10 +128550,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.137.5"; + version = "0.138.2"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.137.5.tgz"; - sha512 = "rTyr+HDFxjnN8+N/guZjDgfVxgHptZQpf6xfL/Mo7a5JYIFwK6tAq3bzxYYB4Ae0RosDZlDuP+X5aXDXz+XnHQ=="; + url = "https://registry.npmjs.org/three/-/three-0.138.2.tgz"; + sha512 = "l49+mdqpevKIk7ByLmt7cc5RdSwSnZ6rP1cLe8VCI/++c0/6AFYyHw6xjT2VyXYxodCnDSw7iARjKL2MlHVCOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128065,10 +128997,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.5.5"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128083,10 +129015,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.6.tgz"; - sha512 = "nLB9qvCFq/jRj21tC6SPZgde8JkNbCQZVjoeBHYsCZvzBgSyNh1A1k5puAM9g/kWlEvAlN/G4J8tETbnJySVpg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.7.tgz"; + sha512 = "xjw6C9PctpLSwKEqaavSKfeH1CRmx1sD/DWXjig4xA/e9Y9/Mr70ViOinq5grFzexzDcdqdb7VDdkf7Ke+eZFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -128107,7 +129039,7 @@ in sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" @@ -128175,10 +129107,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz"; + sha512 = "peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -128220,7 +129152,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@primer/octicons-16.3.1" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -128229,7 +129161,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.25" + sources."@types/node-16.11.26" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -128287,7 +129219,7 @@ in sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -128473,7 +129405,7 @@ in sources."y18n-5.0.8" sources."yallist-2.1.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -128503,7 +129435,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128559,19 +129491,19 @@ in sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" sources."to-vfile-7.2.3" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-9.0.5" sources."unist-util-inspect-7.0.0" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.1" sources."util-deprecate-1.0.2" - sources."vfile-5.3.0" - sources."vfile-message-3.1.0" + sources."vfile-5.3.1" + sources."vfile-message-3.1.1" (sources."vfile-reporter-7.0.3" // { dependencies = [ sources."supports-color-9.2.1" @@ -128743,7 +129675,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -128813,7 +129745,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@vercel/build-utils-2.14.0" sources."@vercel/go-1.3.0" sources."@vercel/node-1.13.0" @@ -128923,10 +129855,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.5.tgz"; - sha512 = "893GcGS5oFjBK2Dakdl4I0x8rtkgI+TOi44M9PmFU6YV+kwoLIRAxIcoF55rGiHFESCq98C+yjWn1OXznWgm7A=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.6.tgz"; + sha512 = "mgX18AzHsg2sDqh4aVVjk23iXf2s93lN7SZnZq2JE74/uGeXfrBckix3YdKtxgZe1vb1tiwDz9JRqoRV9SyGng=="; }; buildInputs = globalBuildInputs; meta = { @@ -129039,7 +129971,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -129119,7 +130051,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -129304,25 +130236,25 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.0.0.tgz"; - sha512 = "DTFhpzUhP3M5WA62WT/SVSxtq47R5rbIEznA7svxWD19/+D1iGBrrzAa8LrDCkLUMxyG3gbya99LczV4F9m6Yg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.1.0.tgz"; + sha512 = "HZfrlqpVu8N0UkSyjldPsGFpVFByYaDRDMmBvmKwKai2rAsd2vtde2CFnX9rOpmg3pN2vET8j3qtqZvZLzmkjQ=="; }; dependencies = [ sources."core-js-3.21.1" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.7" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" - sources."vscode-html-languageservice-4.2.1" + sources."vscode-html-languageservice-4.2.2" sources."vscode-json-languageservice-4.2.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -129341,11 +130273,11 @@ in bypassCache = true; reconstructLock = true; }; - "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + "vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; version = "1.6.8"; - src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.6" sources."@types/eslint-8.4.1" @@ -129439,10 +130371,10 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.75" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.9.0" + sources."enhanced-resolve-5.9.1" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -129478,7 +130410,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" @@ -129606,7 +130538,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -129629,7 +130561,7 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" sources."uri-js-4.4.1" @@ -129952,7 +130884,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -130015,7 +130947,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -130825,7 +131757,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.1" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -130857,7 +131789,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.1" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -131010,7 +131942,7 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-3.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-3.0.2" @@ -131119,7 +132051,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -131157,7 +132089,7 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."debug-4.3.3" sources."eslint-visitor-keys-3.3.0" @@ -131166,7 +132098,7 @@ in sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.3" // { + (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -131177,7 +132109,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -131323,7 +132255,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.2" // { @@ -131373,7 +132305,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" @@ -131622,7 +132554,7 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -131671,7 +132603,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ @@ -131702,7 +132634,7 @@ in sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131729,8 +132661,8 @@ in sources."caniuse-lite-1.0.30001312" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.71" - sources."enhanced-resolve-5.9.0" + sources."electron-to-chromium-1.4.75" + sources."enhanced-resolve-5.9.1" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -131765,7 +132697,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -131875,14 +132807,14 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ajv-8.10.0" @@ -131970,7 +132902,7 @@ in sources."graceful-fs-4.2.9" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hpack.js-2.1.6" // { dependencies = [ @@ -132232,7 +133164,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -132422,7 +133354,7 @@ in sources."node-gyp-build-4.3.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-8.4.0" sources."package-json-versionify-1.0.4" @@ -132532,7 +133464,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.8.2" // { + (sources."webtorrent-1.8.3" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -132550,7 +133482,7 @@ in sources."xmldom-0.1.31" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -132753,7 +133685,7 @@ in (sources."@npmcli/map-workspaces-2.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" ]; }) (sources."@npmcli/metavuln-calculator-2.0.0" // { @@ -132784,7 +133716,7 @@ in sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.0" // { + (sources."agentkeepalive-4.2.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -133175,7 +134107,7 @@ in sources."ansi-regex-5.0.1" sources."are-we-there-yet-3.0.0" sources."env-paths-2.2.1" - sources."gauge-4.0.1" + sources."gauge-4.0.2" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.1" sources."readable-stream-3.6.0" @@ -133225,7 +134157,7 @@ in sources."debug-4.3.3" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.0" sources."make-fetch-happen-10.0.3" sources."ms-2.1.2" ]; @@ -133674,10 +134606,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-5.1.0.tgz"; - sha512 = "J62b/7sFwqt4zbmPbeKJGwZlvW2X3ynyfWHZPr+xLAGF80h4aY4SgXaadMjljpvIbWGOwRmK38vwEdi5XgUpcQ=="; + url = "https://registry.npmjs.org/zx/-/zx-5.2.0.tgz"; + sha512 = "EzaYf8TGosgEGli8CpcDHnvZck/FRv3vEjIzYnhZLib8H+jKc3p4CG2epTayDqCOYQ2v0xsv2DoQ1Hn2OZ0o/g=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -133685,7 +134617,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."braces-3.0.2" sources."chalk-5.0.0" sources."data-uri-to-buffer-4.0.0" @@ -133698,7 +134630,7 @@ in sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."glob-parent-5.1.2" sources."globby-13.1.1" sources."graceful-fs-4.2.9" @@ -133713,7 +134645,7 @@ in sources."micromatch-4.0.4" sources."minimist-1.2.5" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.0" + sources."node-fetch-3.2.1" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index c9edfd62e0..bfef3d5b6c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; - buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; + strictDeps = false; + outputs = [ "out" "bin" "dev" ]; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index 8ecac1c124..f7478f93b9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix index de6ade6151..7468900e07 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix @@ -13,9 +13,11 @@ buildDunePackage rec { sha256 = "17jm79np69ixp53a4njxnlb1pg8sd1g47nm3nyki9clkc8d4qsyv"; }; - buildInputs = [ which menhir ]; + nativeBuildInputs = [ which menhir ]; propagatedBuildInputs = [ easy-format re ]; + strictDeps = true; + doCheck = true; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index f8e07fd126..ea009083e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -36,10 +36,9 @@ stdenv.mkDerivation rec { export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" ''; - nativeBuildInputs = [ which makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - linenoise + buildInputs = [ linenoise ounit ppx_bitstring z3 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 69e8289df2..184f10a52b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num, ounit , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1cd7475n1mxhq482aidmhh27mq5p2vmb8d9fkb1mlza9pz5z66yq"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + checkInputs = [ qtest ounit ]; propagatedBuildInputs = [ num ]; + strictDeps = !doCheck; + inherit doCheck; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix index 3397821319..c801623072 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_pcre ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_pcre ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index e02b1159a9..a5f5ae33ed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,9 +14,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; + strictDeps = !doCheck; + propagatedBuildInputs = [ bigarray-compat ]; - checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + nativeBuildInputs = [ findlib pkg-config ]; + checkInputs = [ alcotest astring fpath bos ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix index 852459c2ba..e8d36526d2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }: buildDunePackage rec { pname = "bigstringaf"; @@ -15,6 +15,10 @@ buildDunePackage rec { sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config ]; checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix index 795e634012..5a2e2ea9a7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; }; - buildInputs = [ ocaml findlib easy-format ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ easy-format ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix index 535b34b03d..75725f1355 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix @@ -15,6 +15,8 @@ buildDunePackage rec { propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + postPatch = '' patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix index 2ac3a0ba3e..07649f3655 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; }; - buildInputs = [ autoreconfHook which ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix index a6b63676e7..46e3b6f16c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; + + strictDeps = true; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix index 17a0185829..07d4d4864d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix index 617715fc6e..4ac0262e1e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - ]; - - buildInputs = [ ocaml findlib ]; @@ -30,6 +27,8 @@ stdenv.mkDerivation rec { bzip2 ]; + strictDeps = true; + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix index 29927aae04..4c089b76f3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix index ba36cfa05b..a83c7c474a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - buildInputs = [ dune-configurator cppo graphics lablgtk stdio ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ dune-configurator graphics lablgtk stdio ]; meta = with lib; { branch = "5.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix index 42c27f15a5..06456b9c93 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl"; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix index c2c2e98b2e..8124b8d8e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix @@ -33,10 +33,12 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [zlib]; + strictDeps = true; + inherit (param) patches; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 79c7a46e6e..43bbfe7b6a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; }; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 67bd8b8c75..e639538369 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; })]; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix index 090b96ece0..a75f05b33f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix @@ -13,7 +13,9 @@ buildDunePackage rec { sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; + + strictDeps = true; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix index 105a6a9dfe..d9606cda1f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 97e00dc71b..6868ddc785 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -48,13 +48,15 @@ buildDunePackage rec { ]; doCheck = true; + nativeBuildInputs = [ + findlib + ]; checkInputs = [ base64 alcotest alcotest-lwt crowbar lwt - findlib mirage-flow ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index 303fdc0101..62a29a5d41 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - buildInputs = [ m4 ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index 3483af1dd4..3a07707a4c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -18,10 +18,8 @@ buildDunePackage rec { sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5"; }; - nativeBuildInputs = [ - dune-configurator - pkg-config - ]; + buildInputs = [ dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ bigarray-compat optint diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix index c5a3dcde22..7a8a3f2e70 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; - buildInputs = [ perl ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ perl ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix index 7e49679406..9536cc2529 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix index f0697a9d88..f2e0919bde 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix @@ -24,9 +24,11 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; + buildInputs = [ re ]; + + strictDeps = true; - checkInputs = [ re ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix index 1d7c314f00..1da631d683 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub, type_conv }: +{ lib, buildOcaml, fetchFromGitHub, type_conv, camlp4 }: buildOcaml rec { pname = "comparelib"; @@ -13,6 +13,7 @@ buildOcaml rec { sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA="; }; + buildInputs = [ camlp4 ]; propagatedBuildInputs = [ type_conv ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix index c408d1a392..b9dde0e642 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix index 632430fe4f..3f60263736 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix @@ -15,9 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl"; }; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ camlpdf ]; + strictDeps = true; + preInstall = '' mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix index 6011c6953b..aeaa87aaf7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation { sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; dontConfigure = true; # Skip configure phase diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix index ee68782313..cd298fb39a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index 8c20a68c27..833ea45a86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ integers libffi bigarray-compat ]; + strictDeps = true; + buildPhase = '' make XEN=false libffi.config ctypes-base ctypes-stubs make XEN=false ctypes-foreign diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index 2ddaec5c7c..dba0bcb926 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,5 @@ { lib, ocaml, fetchurl, buildDunePackage +, pkg-config, which , bigarray-compat, eqaf, stdlib-shims , alcotest, astring, bos, findlib, fpath }: @@ -14,8 +15,13 @@ buildDunePackage rec { sha256 = "01gwkbrznci4xdcbww4ysgsciz2qs0r8jsmhp0siwbcgcrf1jjv5"; }; + nativeBuildInputs = [ findlib which ]; + buildInputs = [ ocaml ]; + propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; + strictDeps = !doCheck; + checkInputs = [ alcotest astring bos fpath ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix index 9a21da9868..7a7a14192f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix @@ -16,7 +16,9 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; # Testr are not compatible with menhir 20211128 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix index 64fb2b2c5a..599cc35603 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix index 733427cdb9..daf5b3779d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dose3"; - version = "6.1"; + version = "7.0.0"; src = fetchFromGitLab { owner = "irill"; repo = "dose3"; rev = version; - sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI="; + sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; minimalOCamlVersion = "4.03"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix index 7bdaf2dfad..3faef36e8e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix index 5b5b107b69..64017bd65f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix index 2ddef0f405..df7f140e54 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - buildInputs = [ perl ocaml findlib ]; + nativeBuildInputs = [ perl ocaml findlib ]; propagatedBuildInputs = [ apron camlidl gmp mpfr ]; + strictDeps = true; + prefixKey = "--prefix "; configureFlags = [ "--use-apron" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 69ac628d20..e3af173edc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -6,6 +6,7 @@ , ocaml , lwt_react , opaline +, ocamlbuild , ppx_deriving , findlib , js_of_ocaml-ocamlbuild @@ -28,13 +29,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml which findlib + opaline + ocamlbuild + ]; + buildInputs = [ js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json - opaline ocamlnet ]; @@ -48,6 +52,8 @@ stdenv.mkDerivation rec { ppx_deriving ]; + strictDeps = true; + installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; setupHook = [ ./setup-hook.sh ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix index d7f467e8eb..9bedc42151 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; + strictDeps = true; + createFindlibDestdir = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix index fa072f8bd1..ebf9cdaad6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 3447d590ea..1507154d2f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + buildInputs = [ camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; + strictDeps = true; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix index 219b8164e7..326ffc60b1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz"; }; - buildInputs = [ocaml findlib ounit expat]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit expat]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix index e951acaa71..6fb7927073 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "gcc" "\$(CC)" ''; - buildInputs = [ ocaml findlib expat ounit ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ expat ounit ]; + + strictDeps = true; doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index d186078883..7f50548f4b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"; }; - buildInputs = [ ocaml findlib cppo ]; + nativeBuildInputs = [ ocaml findlib cppo ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix index 79b742da57..1ac5595a01 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ faraday ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix index a66976b4a2..edf8d08eaa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg cmdliner ]; - propagatedBuildInputs = [ seq stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix index f4afe80d53..2eca9a4644 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml fontconfig ]; + nativeBuildInputs = [ pkg-config ocaml ]; + buildInputs = [ fontconfig ]; + + strictDeps = true; + makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix index 532210888b..53489f69cc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix index bc74a5b58a..c05422497e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix index 959963c475..a05472366a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; installTargets = [ "ocamlfind-install" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix index 3400774d4c..e3bf2fb5d6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + doCheck = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix index 58e2b67eac..ec8bbb3161 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: let - inherit (lib) getVersion versionAtLeast; - - pname = "gg"; - version = "0.9.1"; - webpage = "https://erratique.ch/software/${pname}"; + homepage = "https://erratique.ch/software/gg"; + version = "1.0.0"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "gg is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-gg"; + inherit version; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; + url = "${homepage}/releases/gg-${version}.tbz"; + sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; - createFindlibDestdir = true; - - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; + inherit (topkg) buildPhase installPhase; meta = with lib; { description = "Basic types for computer graphics in OCaml"; @@ -35,8 +31,8 @@ stdenv.mkDerivation { matrices, quaternions, axis aligned boxes, colors, color spaces, and raster data. ''; - homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit homepage; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix index 29df5ce8f4..50be2adcb3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib gdome2 libxslt]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ gdome2 libxslt]; propagatedBuildInputs = [gdome2]; + strictDeps = true; + meta = { homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix index 8a29439c7a..004aa5c9a4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -12,7 +12,9 @@ buildDunePackage { zarith ]; - buildInputs = [ + nativeBuildInputs = [ cppo ]; + + strictDeps = true; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index c785233825..58fa1eb002 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontAddStaticConfigureFlags = true; configurePlatforms = []; - buildInputs = [ + nativeBuildInputs = [ which ocaml findlib @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cppo ]; + strictDeps = true; + doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix index 14c775d25f..f9267ede60 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { version = "112.35.00"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix index 2caa25654e..44b1d5f150 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,9 +13,12 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; + strictDeps = true; + minimumOCamlVersion = "4.03"; - buildInputs = [ pkgs.hidapi pkg-config dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkgs.hidapi dune-configurator ]; propagatedBuildInputs = [ bigstring ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix index 67622a8ef6..d0ae47031b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix index 0775e21b1f..0b05a83dd7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix @@ -21,14 +21,11 @@ buildDunePackage rec { sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t ''; - nativeBuildInputs = [ - dune-configurator - ]; - propagatedBuildInputs = lib.optional withLwt lwt; buildInputs = [ cmdliner + dune-configurator ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix index 90308ee7d6..cbeae7bca8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ocaml_pcre ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index e8289d9296..d1c6dc3761 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -19,9 +19,13 @@ stdenv.mkDerivation rec { sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; }) ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_lwt ]; checkInputs = [ ounit fileutils ]; + # Otherwise checkInputs can't be found + strictDeps = false; + configureFlags = [ "--enable-lwt" (lib.optionalString doCheck "--enable-tests") ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix index add1828100..ff9ce94bbb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix index 10d8886d99..c3b4b0c6d7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -24,6 +24,7 @@ with self; hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri"; meta.description = "Full standard library replacement for OCaml"; propagatedBuildInputs = [ sexplib0 ]; + buildInputs = [ dune_1 ]; }; stdio = janePackage { @@ -207,7 +208,7 @@ with self; pname = "jst-config"; hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93"; meta.description = "Compile-time configuration for Jane Street libraries"; - buildInputs = [ ppx_assert ]; + buildInputs = [ dune_1 ppx_assert ]; }; ppx_optcomp = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index d22a87a92f..2f9aeea1d6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -203,6 +203,8 @@ with self; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; checkInputs = [ ppx_jane ]; + # This currently fails with dune + strictDeps = false; }; core = janePackage { @@ -664,6 +666,7 @@ with self; pname = "pythonlib"; hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; meta.description = "A library to help writing wrappers around ocaml code for python"; + meta.broken = lib.versionAtLeast ocaml.version "4.13"; propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; }; @@ -761,6 +764,8 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; + # This currently fails with dune + strictDeps = false; }; shexp = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 9a67db4966..63c4a900fc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: -{ pname, version ? defaultVersion, hash, ...}@args: +{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args: buildDunePackage (args // { - inherit version; + inherit version buildInputs; minimumOCamlVersion = "4.04"; @@ -14,6 +14,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.asl20; homepage = "https://github.com/janestreet/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 6c7d746e94..3d280a509a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -5,7 +5,7 @@ buildDunePackage (args // { inherit version; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +14,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.mit; homepage = "https://github.com/janestreet/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index 1ed2e6bc4f..d124baea89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -5,11 +5,13 @@ , hash , minimumOCamlVersion ? "4.08" , doCheck ? true +, buildInputs ? [] +, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version; + inherit version buildInputs strictDeps; inherit minimumOCamlVersion; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix index 78b61de8d9..ccd3fa19a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix index c228242fda..2b9c991838 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; }; - buildInputs = [ findlib topkg ]; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix index da4318aef4..85c27f93a0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; }; - buildInputs = [ ocaml findlib freeglut ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ freeglut ]; propagatedBuildInputs = [ libGLU libGL ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index f2fbc71b5a..bcf82e1c38 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index d97f2f5bff..736e345dfb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index f64b657197..f37c3b5c6f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview camlp4 ]; + nativeBuildInputs = [ pkg-config ocaml findlib camlp4 ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix index a442ae35aa..36ade6979c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 971668ce0e..56e79ffc59 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation rec { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; - buildInputs = [ ocaml findlib tcl tk makeWrapper ]; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; + buildInputs = [ tcl tk ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix index 0d5babad04..b7ed4f24b1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }: + +let params = + if lib.versionAtLeast ocaml.version "4.08" then { + version = "3.2.0"; + sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"; + } else { + version = "3.1.0"; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + } +; in buildDunePackage rec { pname = "lambda-term"; - version = "3.1.0"; + inherit (params) version; useDune2 = true; @@ -10,7 +20,7 @@ buildDunePackage rec { owner = "ocaml-community"; repo = pname; rev = version; - sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + inherit (params) sha256; }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix index 264d95f39f..9ab3d906ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation { inherit (libllvm) src; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python2 ocaml findlib ctypes ]; + nativeBuildInputs = [ cmake python2 ocaml findlib ]; + buildInputs = [ ctypes ]; propagatedBuildInputs = [ libllvm ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" # fixes bytecode builds "-DLLVM_OCAML_OUT_OF_TREE=TRUE" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix index 157e7c52fe..4359f09ebd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg fmt cmdliner lwt ] + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ fmt cmdliner lwt topkg ] ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; + strictDeps = true; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix index 8a4f58ccbb..586fc39506 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; - nativeBuildInputs = [ opaline ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ opaline ocaml findlib ocamlbuild ]; + + strictDeps = true; buildFlags = [ "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix index 34aadc8761..a2a6f14524 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -24,7 +24,8 @@ buildDunePackage rec { ptime ]; - doCheck = true; + # for some reason this never exits + doCheck = false; meta = { description = "An opinionated clean-exit and signal-handling library for Lwt programs"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index 76e973a813..96e3abc267 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -19,9 +19,12 @@ buildDunePackage rec { sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; }; - nativeBuildInputs = [ pkg-config cppo dune-configurator ]; - buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims - ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; + strictDeps = true; + + nativeBuildInputs = [ pkg-config cppo ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims; + buildInputs = [ dune-configurator ] + ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix index a91e898227..d47c0c4f11 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI="; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ pgocaml ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + propagatedBuildInputs = [ pgocaml camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix index f9fec120a6..87c43fb686 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ ocaml findlib imagemagick ]; + nativeBuildInputs = [ which pkg-config ocaml findlib ]; + buildInputs = [ imagemagick ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index cd9cb2370d..09f505c0e2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -8,6 +8,8 @@ buildDunePackage rec { version = "2.1.0"; useDune2 = true; + minimalOCamlVersion = "4.08"; + src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o="; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix index 6d4fcad097..9cb35f34c1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - buildInputs = [ cppo ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; meta = with lib; { homepage = "https://github.com/let-def/merlin-extend"; 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 102d3d2de0..c942972597 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 @@ -19,13 +19,16 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; - nativeBuildInputs = [ dune-configurator pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct eqaf ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; + strictDeps = !doCheck; + meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; 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 bcd7a1f04f..5506243ec3 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 @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , mirage-crypto , dune-configurator @@ -16,18 +17,18 @@ , ocaml-freestanding }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) minimumOCamlVersion src version - useDune2 - ; + useDune2; - nativeBuildInputs = [ - pkg-config + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ocaml dune-configurator ]; propagatedBuildInputs = [ @@ -38,6 +39,8 @@ buildDunePackage { ocaml-freestanding ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ hex 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 82400b5da7..9a2b9c98e4 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 @@ -1,7 +1,7 @@ { buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -10,6 +10,8 @@ buildDunePackage { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ ounit randomconv ]; 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 e8c8dd06ea..91da7aa568 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,7 +8,7 @@ buildDunePackage { inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; - nativeBuildInputs = [ + buildInputs = [ dune-configurator ]; @@ -19,6 +19,8 @@ buildDunePackage { mirage-crypto-rng ]; + strictDeps = true; + meta = mirage-crypto.meta // { description = "Feed the entropy source in an Async-friendly way"; }; 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 5152d3c8ec..8d67ade9b4 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 @@ -3,7 +3,7 @@ , logs, lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; @@ -14,6 +14,8 @@ buildDunePackage { propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; }; 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 b4da068163..2281f10580 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 @@ -1,7 +1,7 @@ { buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -9,9 +9,11 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit randomconv ]; - nativeBuildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix index ffd7815068..a396549d76 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { ]; preConfigure = "make clean"; - buildInputs = [ocaml findlib gmp mpfr ncurses]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ gmp mpfr ncurses]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 4e27c8ff3b..d12329b811 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; }; - buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; + nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ]; + buildInputs = [ gmp mpfr ]; + + strictDeps = true; prefixKey = "-prefix "; configureFlags = [ @@ -20,7 +23,7 @@ stdenv.mkDerivation rec { postConfigure = '' sed -i Makefile \ - -e 's|^ /bin/rm | rm |' + -e 's|/bin/rm|rm|' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index 3e4438f6da..ace2963396 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ optional jsooSupport js_of_ocaml; + + strictDeps = true; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix index 6ccdfa9cf8..c980984a26 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix @@ -22,12 +22,14 @@ stdenv.mkDerivation rec { "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; createFindlibDestdir = true; propagatedBuildInputs = [ libmysqlclient ]; + strictDeps = true; + patches = [ (fetchpatch { url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index fdd24094c1..d179c8c1c9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -56,9 +56,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ]; - buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ]; + buildInputs = [ topkg cpuid ocb-stubblr ocamlbuild ]; propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; + strictDeps = true; + buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix index 94342bb312..1598b2ee5c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix @@ -19,10 +19,13 @@ stdenv.mkDerivation rec { sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocb-stubblr topkg ocamlbuild ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-lwt ${boolToString withLwt}"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix index b1293a2ab5..1f978a90df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional withStatic ./enable-static.patch; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; - meta = { description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; license = lib.licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 7d2960fc5a..6748619d49 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,9 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ ocaml automake gnum4 autoconf - findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; + nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ]; + buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 581890178e..b4410981af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvirt ]; - nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ]; + nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = [ ocaml ]; + strictDeps = true; buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; installTargets = "install-opt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 5d8d967bf4..009d95992f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,5 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: +if lib.versionOlder "4.13" ocaml.version +then throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix index d76a98fc05..fcee63de3b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -27,7 +27,11 @@ buildDunePackage rec { ' libRmath"' '"' ''; - buildInputs = [ pkg-config R dune-configurator stdio ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config R ]; + buildInputs = [ dune-configurator stdio R ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix index c2ca6a2cc8..4dcaca4278 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }: +{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }: buildDunePackage { pname = "ocamlfuse"; @@ -11,6 +11,11 @@ buildDunePackage { sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ camlidl ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix index f8d20b7124..66bd00707a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; - buildInputs = [ocaml findlib ounit]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit]; + + strictDeps = true; prefixKey = "--prefix "; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix index d6e8f83968..d435d7a048 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; }; - nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; + nativeBuildInputs = [ pkg-config which ocaml findlib ]; + buildInputs = [ ncurses ocaml_pcre camlzip gnutls nettle ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 7c782b5268..3482aa37e7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 2f26eb32ff..fcd63ced7a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -12,10 +12,13 @@ stdenv.mkDerivation rec { patches = [ ./pkg-config.patch ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ocamlbuild ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 7635f3a686..763617be13 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; }; - buildInputs = [ ocaml findlib astring pprint ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ astring pprint ]; + + strictDeps = true; + createFindlibDestdir = true; installFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 8435d1c5e5..474f69546d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation { sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook ocaml findlib ]; + + strictDeps = true; installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2e20838ec..480ea6daf2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild oasis camlp4 ]; + buildInputs = [ oasis camlp4 ocamlbuild num ]; + + strictDeps = true; meta = { homepage = "https://github.com/ocsigen/deriving"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 1fccbbb9b3..118138dc8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson -, cohttp-lwt-unix +, cohttp-lwt-unix, eliom , resource-pooling , ocamlnet }: @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocsigen-start"; version = "4.3.0"; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib eliom ]; propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ]; + strictDeps = true; + patches = [ ./templates-dir.patch ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 78420d0977..1b2dd72a2e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { version = "3.0.1"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; - buildInputs = [ ocaml findlib opaline ]; + nativeBuildInputs = [ ocaml findlib opaline eliom ]; + + strictDeps = true; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix index ea2af8dd4c..5e815d4dca 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix @@ -13,8 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkg-config ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ curl lwt ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix index aed5e92765..8967a38154 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix @@ -17,7 +17,9 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "Date and duration in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix index 9179ce3f1d..66fc5d1f18 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ type_conv ounit camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix index d6cea183d8..b9797e257a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix index 1480a7d591..ff9ad75fad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -15,8 +15,9 @@ buildDunePackage rec { --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" ''; - nativeBuildInputs = [ unzip ]; - buildInputs = [ curl ]; + strictDeps = true; + + nativeBuildInputs = [ unzip curl ]; propagatedBuildInputs = [ opam-format ]; meta = opam-format.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix index 0642b30699..91d91bdc46 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation { sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix index 17e8fc855e..c3f53fc611 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,7 +19,9 @@ buildDunePackage rec { sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix index fbb75e6133..a40111cd3b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix @@ -4,9 +4,11 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-ounit"; inherit (ounit2) version src meta; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; + strictDeps = true; + dontBuild = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix index 489ca3d2c7..251aeb8de8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { pname = "pipebang"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 590c001c41..4f2e469335 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - buildInputs = [ ocaml findlib piqi stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ piqi stdlib-shims ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix index faeb804d8a..45d65a5be0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb"; }; - buildInputs = [ ocaml findlib which ]; + nativeBuildInputs = [ ocaml findlib which ]; propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ]; + strictDeps = true; + patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 935d67f708..f4794eea76 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -9,6 +9,7 @@ , num , ppxlib , re +, findlib }: buildDunePackage rec { @@ -26,17 +27,21 @@ buildDunePackage rec { sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; + nativeBuildInputs = [ cppo ]; + buildInputs = [ bigarray-compat containers - cppo ctypes integers num ppxlib re + findlib ]; + strictDeps = true; + meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 5563e61134..fbe484dea0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -6,6 +6,7 @@ , ppx_derivers , result , ounit +, ounit2 , ocaml-migrate-parsetree , ocaml-migrate-parsetree-2 }: @@ -37,7 +38,11 @@ buildDunePackage rec { inherit (params) sha256; }; - buildInputs = [ ppxlib cppo ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ ppxlib ]; propagatedBuildInputs = [ (if params.useOMP2 then ocaml-migrate-parsetree-2 @@ -47,7 +52,9 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ + (if lib.versionAtLeast version "5.2" then ounit2 else ounit) + ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index 64948c29ae..59b7c29730 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -5,6 +5,7 @@ let param = version = "6.4"; sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; useDune2 = true; + nativeBuildInputs = [cppo]; buildInputs = [cppo]; }; in { @@ -54,7 +55,9 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version useDune2 buildInputs; + inherit (param) version useDune2 buildInputs nativeBuildInputs; + + strictDeps = true; } else stdenv.mkDerivation { @@ -63,7 +66,8 @@ else inherit src; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix index b42df087a9..179e559d72 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix @@ -17,8 +17,8 @@ buildDunePackage rec { checkInputs = [ mdx.bin ]; - # mdx is not available for OCaml < 4.07 - doCheck = lib.versionAtLeast ocaml.version "4.07"; + # mdx is not available for OCaml < 4.08 + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/c-cube/printbox/"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix index 91e30e155d..bfbd466bad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix @@ -7,7 +7,7 @@ , cohttp , ocaml_lwt , cohttp-lwt-unix -, lambdaTerm +, lambda-term , stdlib-shims }: @@ -30,7 +30,7 @@ buildDunePackage rec { cohttp ocaml_lwt cohttp-lwt-unix - lambdaTerm + lambda-term stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index dbdf3970f6..25c9ec4b87 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -15,7 +15,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index 7015c6058b..ac30876520 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ lib.optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml; + + strictDeps = true; propagatedBuildInputs = [ result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix index 018f1e3edf..fd59368f82 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,12 +14,13 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; + strictDeps = true; + + buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; doCheck = true; - checkInputs = [ stdlib-shims ]; - meta = { homepage = "https://www.lri.fr/~filliatr/software.en.html"; description = "Maps over integers implemented as Patricia trees"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix deleted file mode 100644 index c19b40eb9a..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }: - -# This is the original pycaml version with patches from debian. - -stdenv.mkDerivation rec { - pname = "pycaml"; - version = "0.82-14"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${lib.versions.majorMinor version}.orig.tar.gz"; - sha256 = "d57be559c8d586c575717d47817986bbdbcebe2ffd16ad6b291525c62868babe"; - }) - - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${version}.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }) - ]; - - postPatch = '' - rm -f Makefile* configure* - cp ../debian/META ../debian/Makefile . - sed -i "Makefile" -e's|/usr/share/ocamlmakefile/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' - ''; - - sourceRoot = "pycaml"; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ ncurses ocaml findlib python2 ocaml_make ]; - createFindlibDestdir = true; - - # the Makefile is not shipped with an install target, hence we do it ourselves. - installPhase = '' - ocamlfind install pycaml \ - dllpycaml_stubs.so libpycaml_stubs.a pycaml.a pycaml.cma \ - pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa \ - META - ''; - - meta = { - homepage = "https://github.com/chemoelectric/pycaml"; - description = "Bindings for python and ocaml"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix index 7bc794fa24..afcc47e38d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "pyml"; - version = "20210226"; + version = "20211015"; src = fetchFromGitHub { owner = "thierry-martinez"; repo = pname; rev = version; - sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7"; + sha256 = "sha256-GCO6KlRhJmADFjQ5QF4naMQBskF63yqnJnLnuQsagEk="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib + ]; + buildInputs = [ utop ncurses ]; @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { stdcompat ]; + strictDeps = true; + buildPhase = '' make all pymltop pymlutop PREFIX=$out ''; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/react/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/react/default.nix index 0edae98306..4e07a2021e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/react/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/react/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; - buildInputs = [ ocaml findlib topkg ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix index bc0c8f9e9b..23ebb3144d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A="; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild opaline ]; propagatedBuildInputs = [ react ]; + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix index 1a4c020dc3..ee5e7d2774 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -3,9 +3,12 @@ { pname = "cli"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ re - reason pastel ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix index c11c12b467..b4b30cab4a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix @@ -3,7 +3,7 @@ { pname = "console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix index e6eb9c0c40..6b2aa0c3cd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -3,7 +3,7 @@ { pname = "dir"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index 749e727fee..a7c663493e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -3,7 +3,7 @@ { pname = "file-context-printer"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix index ae6ae50705..8ff2ed65c4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -3,7 +3,7 @@ { pname = "fp"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index f1d2c7cc72..968b9f88af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -3,7 +3,7 @@ { pname = "pastel-console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix index a5abc4e219..f2c975d938 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -5,7 +5,7 @@ minimalOCamlVersion = "4.05"; - buildInputs = [ + nativeBuildInputs = [ reason ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index 993bcbefaf..1250dc2d3a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -3,7 +3,7 @@ { pname = "qcheck-rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 9b14d4a8ba..b4d6708467 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -3,7 +3,7 @@ { pname = "refmterr"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 6e8b41bbd1..8a7080f624 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -3,9 +3,12 @@ { pname = "rely-junit-reporter"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ atdgen - reason ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix index a2230426be..f29565f9c4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -3,7 +3,7 @@ { pname = "rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix index 9410ab21ea..9ac090a780 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix @@ -6,7 +6,7 @@ let param = version = "0.6.2"; url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i"; - buildInputs = [ dune_2 ]; + nativeBuildInputs = [ dune_2 ]; extra = { buildPhase = "dune build -p rope"; installPhase = '' @@ -17,7 +17,7 @@ let param = version = "0.5"; url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-0.5.tar.gz"; sha256 = "05fr2f5ch2rqhyaj06rv5218sbg99p1m9pq5sklk04hpslxig21f"; - buildInputs = [ ocamlbuild ]; + nativeBuildInputs = [ ocamlbuild ]; extra = { createFindlibDestdir = true; }; }; in @@ -30,7 +30,10 @@ stdenv.mkDerivation ({ inherit (param) url sha256; }; - buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; + nativeBuildInputs = [ ocaml findlib ] ++ param.nativeBuildInputs; + buildInputs = [ benchmark ] ; + + strictDeps = true; meta = { homepage = "http://rope.forge.ocamlcore.org/"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 1198ca957f..cdc3a1dba6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -8,10 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index 284ba97b9c..3b0878155a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { sha256 = "sha256:0k51rscs9mdgpg3qn4cahql5ncdvlb207m015hr8v6r1vfgn0ddq"; }; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix index c1ea56b5c5..b808145bcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-VhzlDTYBFXgKWT69PqZYLuHkiaDwzhmyX2XfaqzHFl4="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix index c1a76e4149..4cbb658b65 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }: buildDunePackage rec { pname = "sha"; @@ -11,6 +11,8 @@ buildDunePackage rec { useDune2 = true; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index cff3d6186d..040a34ef6f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { ./lib-gen-link-bigarray.patch ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ctypes libsodium ]; + strictDeps = true; + createFindlibDestdir = true; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix index 1605a15bea..141e2a5019 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; - buildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + + strictDeps = true; buildPhase = "make build"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 02a281740b..6009eaecce 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY="; }; - buildInputs = [ ocaml findlib ocamlbuild twt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix index 0f3b5377fc..eae9b264ba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; + # build fails otherwise enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix index 6029401e36..b6d9f20df3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix @@ -23,10 +23,12 @@ buildDunePackage { lwt-watcher ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix index 6eaed94231..5b5690707a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -25,7 +25,7 @@ buildDunePackage { useDune2 = true; - buildInputs = [ + nativeBuildInputs = [ pkg-config ]; @@ -34,6 +34,8 @@ buildDunePackage { lmdb ]; + strictDeps = true; + checkInputs = [ cstruct alcotest diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix index 2321245220..85dc33dc98 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix index 2dec608517..3cfb8cced0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix index 69dad75127..3fbe945d07 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix @@ -31,10 +31,12 @@ buildDunePackage { tezos-legacy-store ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix index b26b81f4a7..44a7576cc0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix @@ -14,10 +14,12 @@ buildDunePackage { tezos-protocol-updater ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix index 6980a148e1..dd765e3882 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm"; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ iso8601 ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index 9e1369a856..10104228c8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = param.propagatedBuildInputs or []; + strictDeps = true; + buildPhase = "${run} build"; createFindlibDestdir = true; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix index 1cf84dd493..7a0c6bdade 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/torch/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { pname = "torch"; - version = "0.13"; + version = "0.14"; useDune2 = true; @@ -27,7 +27,7 @@ buildDunePackage rec { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "0528h1mkrqbmbf7hy91dsnxcg0k55m3jgharr71c652xyd847yz7"; + sha256 = "sha256:039anfvzsalbqi5cdp95bbixcwr2ngharihgd149hcr0wa47y700"; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index 7c09e8cd9d..a56cccbe07 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix index 407601c7a4..4e76f0c16d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 337874e11a..fb3977223f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 4ec160a922..1f6500c6ed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index e90ca2d16a..468b872ec3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildOcaml}: +{ lib, fetchFromGitHub, buildOcaml, camlp4}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix index 7d7d87af85..09004e8a94 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib ocaml ocamlbuild ]; + + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; configurePlatforms = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix index f1ada5d099..9a5848db3f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + + strictDeps = true; buildFlags = [ "all" "all.opt" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix index 244f3f36dc..0c71ddf0d7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 2e8a360d45..9031087f50 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -21,10 +21,13 @@ stdenv.mkDerivation { sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf uunf uucd ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + buildPhase = '' runHook preBuild ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index b260a05505..336d66cb0a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; configurePlatforms = []; buildInputs = [ topkg cmdliner ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index 073e6865fc..12031c5392 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -18,10 +18,13 @@ stdenv.mkDerivation { sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix index 1fbcb57f3a..42642d2dc2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix @@ -15,9 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p"; }; - buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg cmdliner uutf ]; propagatedBuildInputs = [ uucp ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix index e8179e369a..6701c86505 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg cmdliner ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix index 7d2eaac181..4f400d1ec7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix @@ -24,10 +24,12 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; buildInputs = [ angstrom ]; + strictDeps = !doCheck; + checkInputs = [ re ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix index a9a4c0d3d6..9dc7a4eeee 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix @@ -28,12 +28,15 @@ stdenv.mkDerivation { sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ]; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" + " --with-otfm ${boolToString pdfBackend}" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix index bf7fcb66fe..6b00089129 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !lib.versionAtLeast ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "wasm is not available for OCaml ${ocaml.version}" else diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix index 6a21a1e1f7..a8adced938 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = []; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring bos cmdliner rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix index 683d2ec214..8eb700a4d1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-2txmkl/ZN5RGaLQJmr+orqwB4CbFk2RpLJd4gr7kPiE="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix index 43b0bf5faa..f7aa1fdf11 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix index 43fc5b245c..b17f29b435 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation { runHook postInstall ''; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ zarith ]; + strictDeps = true; + meta = z3.meta // { description = "Z3 Theorem Prover (OCaml API)"; }; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix index e40d27e7c3..5138265399 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix @@ -1,38 +1,27 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub # Octave's Python (Python 3) , python -# Needed only to get the correct version of sympy needed -, python2Packages }: let - # Need to use sympy 1.5.1 for https://github.com/cbm755/octsympy/issues/1023 - # It has been addressed, but not merged yet. - # In the meantime, we create a Python environment with Python 3, its mpmath - # version and sympy 1.5 from python2Packages. - pythonEnv = (let - overridenPython = let - packageOverrides = self: super: { - sympy = super.sympy.overridePythonAttrs (old: rec { - version = python2Packages.sympy.version; - src = python2Packages.sympy.src; - }); - }; - in python.override {inherit packageOverrides; self = overridenPython; }; - in overridenPython.withPackages (ps: [ + pythonEnv = python.withPackages (ps: [ ps.sympy ps.mpmath - ])); + ]); in buildOctavePackage rec { pname = "symbolic"; - version = "2.9.0"; + version = "unstable-2021-10-16"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1jr3kg9q6r4r4h3hiwq9fli6wsns73rqfzkrg25plha9195c97h8"; + # https://github.com/cbm755/octsympy/issues/1023 has been resolved, however + # a new release has not been made + src = fetchFromGitHub { + owner = "cbm755"; + repo = "octsympy"; + rev = "5b58530f4ada78c759829ae703a0e5d9832c32d4"; + sha256 = "sha256-n6P1Swjl4RfgxfLY0ZuN3pcL8PcoknA6yxbnw96OZ2k="; }; propagatedBuildInputs = [ pythonEnv ]; diff --git a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix b/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix index 23afd44b67..d8d3bcb2cd 100644 --- a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { comment = "Launcher for Pharo distributions"; desktopName = "Pharo"; genericName = "Pharo"; - categories = "Development;"; + categories = [ "Development" ]; }; # because upstream tarball has no top-level directory. diff --git a/third_party/nixpkgs/pkgs/development/pharo/wrapper/default.nix b/third_party/nixpkgs/pkgs/development/pharo/wrapper/default.nix index 1f08929507..1202b2dce6 100644 --- a/third_party/nixpkgs/pkgs/development/pharo/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/pharo/wrapper/default.nix @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { genericName = "Pharo Virtual Machine"; exec = "pharo %F"; icon = "pharo"; - terminal = "false"; - type="Application"; - startupNotify = "false"; - categories = "Development;"; - mimeType = "application/x-pharo-image"; + startupNotify = false; + categories = [ "Development" ]; + mimeTypes = [ "application/x-pharo-image" ]; }; unpackPhase = '' cp $src ./pharo-vm.sh diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index a3920691a8..4c94b74212 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.2.6"; + version = "2.2.7"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-HVhIa4keWengZMDVS7OFOPdNYBT3VIFULGmthNTpdwQ="; + sha256 = "sha256-EAQN7WY1QZkO74zh9vpEyztKR+FF77jp5ZkHoVBoAz0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 1b90e71fd2..84f3072043 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "3.2.1"; + version = "3.2.2"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "sha256-Ti1jo1do0xiY/FAfyG/YI/TTcgFTMWy8cuhorDodUko="; + sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA="; }; configureFlags = [ "--with-couchbase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix new file mode 100644 index 0000000000..e9b88d8155 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +mkDerivation rec { + pname = "grumphp"; + version = "1.8.1"; + + src = fetchurl { + url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/${pname}/grumphp.phar + makeWrapper ${php}/bin/php $out/bin/grumphp \ + --add-flags "$out/libexec/${pname}/grumphp.phar" + runHook postInstall + ''; + + meta = with lib; { + broken = versionOlder php.version "8.0"; + description = "A PHP code-quality tool"; + homepage = "https://github.com/phpro/grumphp"; + license = licenses.mit; + maintainers = teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix index f3796eb3b6..de3ec2d11d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.2"; - sha256 = "sha256-sGR6sH6kgPzBNTM2jjj9tPS7RdMNzmX8kGUqZwpPQBA="; + version = "3.1.3"; + sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 2ff72b608c..6f28d1af10 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.12.0"; - sha256 = "sha256-DZ9nCwISiLtsmwYJefGR8dp3PXKRAGcxZvOLYX4kMX4="; + version = "1.12.1"; + sha256 = "sha256-kl1+YAXG6Eu0CiUBnBKw7kvaYlxkSXadzn1bAmmD9DM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix new file mode 100644 index 0000000000..0b2e5ff8c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +let + pname = "phing"; + version = "2.17.1"; +in +mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.phing.info/get/phing-${version}.phar"; + sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phing/phing.phar + makeWrapper ${php}/bin/php $out/bin/phing \ + --add-flags "$out/libexec/phing/phing.phar" + ''; + + meta = with lib; { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + license = licenses.lgpl3; + homepage = "https://github.com/phingofficial/phing"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index b00da4972f..9f8a5feb8a 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.6"; + version = "1.4.7"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-h19rFEs7VrdlxGS1qeYJnO5aQaKzpFZTdsN2h3Hmm0w="; + sha256 = "sha256-bsSdFfUVQnbDFH8hO1Z9sHA2w7pMHlLEx1hsgDdCUmE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix index c7c8e8d059..04e6df329a 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "6.0.0"; - sha256 = "sha256-24kHOvonhXvMnnMfe3/fDYHGkyD8vnuC4NaVBwP9TY4="; + version = "6.0.1"; + sha256 = "sha256-ikq+cB5ZPRBCwhB0YQT0sEsVrJjbYzGEju2RrK388ZI="; buildInputs = [ rdkafka pcre2 ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix index f893a4ed79..070112ba65 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.6"; - sha256 = "sha256-/ilewmolIE5sB+jXFEIQ92e9cAiFhxnaIwQJ6z9vLgk="; + version = "5.3.7"; + sha256 = "sha256-uVgWbM2k9AvRfGmY+eIjkCGuZERnzYrVwV3vQgqtZbA="; internalDeps = with php.extensions; [ session diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix index 99b2b53f7e..3cbd55221e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.8.6"; - sha256 = "sha256-4ot8LXpWcjMmD3e/EzrYNMxqUPPupQQkv2ibLkZoWxs="; + version = "4.8.7"; + sha256 = "sha256-yoiMuIbIgwkuvoeIJT1gC8UsOE504nEQ+XsE7Oprb9o="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index 52d4ecdc3b..b6f79b6c5f 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.8.1"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-XPNE68+9qkiuF4wCnAVc7HvHpKR8IeMV5NHwi9NfI1U="; + hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix new file mode 100644 index 0000000000..88bdff440c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paho-mqtt +, pytestCheckHook +, pythonOlder +, requests +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "adafruit-io"; + version = "2.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_IO_Python"; + rev = version; + hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + paho-mqtt + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Adafruit_IO" + ]; + + disabledTestPaths = [ + # Tests requires valid credentials + "tests/test_client.py" + "tests/test_errors.py" + "tests/test_mqtt_client.py" + ]; + + meta = with lib; { + description = "Module for interacting with Adafruit IO"; + homepage = "https://github.com/adafruit/Adafruit_IO_Python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} 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 a93137f136..1ae1a31fa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.6"; + version = "3.20.1"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM="; + sha256 = "sha256-P5OWPsbRsTEMcvw7/uq0rj9p/4beVj/2OdWkllVMKMw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix new file mode 100644 index 0000000000..3e2e9cb2cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, filelock +, etuples +, logical-unification +, minikanren +, cons +, numba +, numba-scipy +, libgpuarray +, sympy +, cython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aesara"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "aesara-devs"; + repo = "aesara"; + rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; + sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + filelock + etuples + logical-unification + minikanren + cons + numba + numba-scipy + libgpuarray + sympy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "aesara" ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/aesara-devs/aesara"; + changelog = "https://github.com/aesara-devs/aesara/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 4e2b0c5897..dbc684281f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.7"; + version = "1.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; + sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index c52a8a1329..82c1145f9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.2.2"; + version = "22.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-RmMI3h8ouFZYD+xeK4bVx0k529UP+Y2KH7r161zst7Y="; + sha256 = "sha256-2RYpeyX88+eEilK/wLDJ6Ock1JBgIUPWbm/ZBJSQ2pg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index a2c3d182be..3101501f3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.6.11"; + version = "0.7.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7"; + sha256 = "sha256-na94H1ll9aZz/mQ4/y3b2vhSaOgo4OjtIsAfW6zGYyI="; }; nativeBuildInputs = [ @@ -34,6 +34,8 @@ buildPythonPackage rec { zeroconf ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index ece6d6140b..5862a7e65a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw="; + hash = "sha256-PslmDeG/o9WAOc0FhidUNaISrlXa3rba3UEuvPVN/+A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea6..451fb9e7fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -17,30 +17,21 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) - ]; - nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; @@ -53,7 +44,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix index 100405c1ab..2cc04130c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o="; + sha256 = "sha256-ktXnAgrxfDELfMQATcWHn/u6C4bKQii+mbT4mA54coo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index 44e532a614..855748f665 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -8,25 +8,34 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.8"; + version = "1.0.10"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4EkqSIQ5p4E4DPLYu9a/lmb1sFhwDqFLhjhZS6Zf5c="; + hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ # AssertionError, https://github.com/timmo001/aiolyric/issues/5 "test_location" ]; - pythonImportsCheck = [ "aiolyric" ]; + + pythonImportsCheck = [ + "aiolyric" + ]; meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; 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 54e2378984..032bf995a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failures seem related to changes in holidays-0.13, https://github.com/azogue/aiopvpc/issues/44 + "test_number_of_national_holidays" + ]; + postPatch = '' substituteInPlace pyproject.toml --replace \ " --cov --cov-report term --cov-report html" "" 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 54eab46962..b1618081b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.2.1"; + version = "22.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-SEF47hz5XbATuuuO5t5H40+kT7RWSBjP0BfYd38pNSw="; + hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index f2bd2f0d36..d6f2c12890 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.9"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-XGmhLc64efQ1eIgCYN1Wkp4sPXvYXlR7/9WF5cWZyys="; + hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix index ab16c2d1e4..db9fbba25b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowebostv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.1.2"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "v${version}"; - hash = "sha256-YSrttPoU5XQ9tqNxhHBUqZqKaEZdUdYYJ2CsSREVbbg="; + hash = "sha256-UKDcIo0jhI84WDcSK3fciRqzKjHwbZXkqHjdo7Xt4iE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index c9eb73c7f0..d09daa273b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.63"; + version = "0.0.64"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-Peg/agAb1lUBUBK1OkYVovE4pzM8iaQHVaSk/hr1plw="; + hash = "sha256-CJJ+mWAX9XG1/E2PljUZ8oz/la3hYXF1tMfuKt0Zvjw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 92d377d088..7cfe51e29c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8="; + hash = "sha256-GK/CqmMm67VmvzlhMV6ow+40m0DYUpXCFkP+9NgR/e4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix index c8b1b78b78..b46152f3a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "v${version}"; - sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA="; + sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix index 8a5694ffde..9dc412ccde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2020-10-24"; + version = "unstable-2022-02-03"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; - sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; + hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix new file mode 100644 index 0000000000..41847e5162 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "asyncsleepiq"; + version = "1.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "93c944ff84fd23832b188320b10681a3b1caf935dd584cdd4e508a9bcc8fec1b"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "asyncsleepiq" ]; + + meta = with lib; { + description = "Async interface to SleepIQ API"; + homepage = "https://github.com/kbickar/asyncsleepiq"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} 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 399926c5e0..468dac5566 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 @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.19.0"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; + sha256 = "sha256-yTRJz5zLt5eV+IHrVVLmVZnkbf0FBLM7CiCQ28X1cgc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix new file mode 100644 index 0000000000..cda3ff5fbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, einops +, fetchFromGitHub +, jax +, jaxlib +, lib +}: + +buildPythonPackage rec { + pname = "augmax"; + version = "unstable-2022-02-19"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "khdlr"; + repo = pname; + # augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. + rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; + sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i"; + }; + + propagatedBuildInputs = [ einops jax ]; + + # augmax does not have any tests at the time of writing (2022-02-19), but + # jaxlib is necessary for the pythonImportsCheckPhase. + checkInputs = [ jaxlib ]; + + pythonImportsCheck = [ "augmax" ]; + + meta = with lib; { + description = "Efficiently Composable Data Augmentation on the GPU with Jax"; + homepage = "https://github.com/khdlr/augmax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} 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 f1152da2d1..2b3b1e4ce8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; + sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI="; }; nativeBuildInputs = [ cmake ]; 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 c5565500a3..db168c9b32 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 @@ -2,32 +2,29 @@ , buildPythonPackage , fetchFromGitHub , six -, pathlib , pytest , mock , parameterized -, isPy27 -, isPy35 +, pythonOlder }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.12.0"; + version = "1.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-3Of3E32+Txe2844pl0sWxj46EgaTG2aEfbAELlxIT/E="; + sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; }; - # Package is not compatible with Python 3.5 - disabled = isPy35; - propagatedBuildInputs = [ six - ] ++ lib.optionals isPy27 [ pathlib ]; + ]; checkInputs = [ pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 2013bc6454..ea0696e294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; + sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index c153534cc6..421f068aa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.0.0"; + version = "16.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; + sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 3038f8720e..3dbb8f5a87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "26.0.0"; + version = "26.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; + sha256 = "sha256-K63nT8sx2PCIFhc+1eCAs/ItESbv9xA+8GDn2hZCJHU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8afcde6201..fae7318cd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "9.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d"; + sha256 = "sha256-jkzGLDqrJgwCnz27lGzFk4d2q+j0P+PU8uUVGQg7MkA="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index b9e75eca44..57fe4655ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.4.0"; + version = "17.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "23a8047668ebd1fa7c3c2445eba4e69c07675306e2a94ae6a3e455df162bd008"; + sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index bfd0b61969..eed367c220 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; + sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index eeec10b5ea..26bc4064fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "171ea8719f543bd0dd4f3d6fa2277162d763182fe8e61b4db03f02668c1685b5"; + sha256 = "sha256-A369Y5cqKthMz43QUvWQHq5ggz93plGObl7K4xnUdnc="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ed5b19bd80..cd7e96049d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 5f9eb41bf8..2adc8b784f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , importlib-metadata -, isPy27 , logfury , pytestCheckHook , pytest-lazy-fixture @@ -16,12 +15,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.14.0"; - disabled = isPy27; + version = "1.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c"; + hash = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; }; nativeBuildInputs = [ @@ -65,5 +66,6 @@ buildPythonPackage rec { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } 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 4a2a2803d3..cf1bbd9c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.2"; + version = "1.7.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA="; + sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix new file mode 100644 index 0000000000..097971c9ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "beartype"; + version = "0.10.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "beartype" + ]; + + meta = with lib; { + description = "Fast runtime type checking for Python"; + homepage = "https://github.com/beartype/beartype"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} 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 49952b4f5f..4a0bd988c1 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 @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.9"; + version = "1.9.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "01fcb5a8fe6de1280cdfd5b37715103ffa0bafb3c739ca7f5ffc41e46549612e"; + sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc="; }; # needs packages which are not available in nixpkgs 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 112f12e5f2..a63df0d7d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 743c749a1f..be7f69fbd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.6"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O/21ne0VyWHm49W38WcVXNoFO+JHXqgBdGHfC02CC30="; + sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 572dbad932..27b7ba03d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -5,11 +5,16 @@ , python-slugify , requests , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "blinkpy"; version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fronzbot"; @@ -38,6 +43,12 @@ buildPythonPackage rec { "blinkpy.sync_module" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test_download_video_exit" + "test_parse_camera_not_in_list" + "test_parse_downloaded_items" + ]; + meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index a6ae6e8703..2836ee24c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; + sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; }; propagatedBuildInputs = [ 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 a1d2fa59cb..a35506c89b 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-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; + sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; }; 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 797395205a..5b64f4c51a 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-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; + sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; + sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; + sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; + sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; + sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; }; 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 0c7e2f3371..97a3eec770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; + sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; }; propagatedBuildInputs = [ twisted future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index eabb352141..247d25bf42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -19,6 +19,7 @@ , pythonOlder , pytz , vine +, nixosTests }: buildPythonPackage rec { @@ -78,6 +79,10 @@ buildPythonPackage rec { "celery" ]; + passthru.tests = { + inherit (nixosTests) sourcehut; + }; + meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix index 7686b91927..be597277b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; 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 354f90f12b..1c5b96ea48 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.56.4"; + version = "0.58.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77"; + sha256 = "sha256-ArpvP4tbRf1fK8BPokRXqS3YyaFiOLBrR8uQHko5iKo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix index 8831999e99..e6db689a45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,26 +1,54 @@ -{ lib, buildPythonPackage, fetchFromGitHub, passlib, dnspython, loguru, toml -, ipaddr, poetry, poetry-core, black, Fabric, pytest, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, passlib +, dnspython +, loguru +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.21"; + version = "1.6.36"; format = "pyproject"; src = fetchFromGitHub { owner = "mpenning"; repo = pname; rev = version; - sha256 = "1d6nzhmdg7zlg1h3lm4v7j4hsb2aqd475r5q5vcqxfdxszc92w21"; + sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; }; - patchPhase = '' + postPatch = '' patchShebangs tests ''; - propagatedBuildInputs = - [ passlib dnspython loguru toml ipaddr poetry black Fabric sphinx ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + passlib + dnspython + loguru + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/parse_test.py" + ]; + + disabledTests = [ + "test_dns_lookup" + "test_reverse_dns_lookup" + ]; + + pythonImportsCheck = [ "ciscoconfparse" ]; meta = with lib; { description = 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 409164cf83..670e4a3c92 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 @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f"; + sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 0e1aca7352..517f3b99be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.8.2"; + version = "1.30.0"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183"; + sha256 = "sha256-IKxeNAMJTMCpP/jz7lHuetHCpddypgYdCKQcI/9pIj8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index a077b82826..6ccd3c98c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.11.2"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-kFNKRWl/Q8vxIELQURfzCRbVs2JYUwbKro/zKlzNcHU="; + sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; }; 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 new file mode 100644 index 0000000000..2977051d87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "cons"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "python-cons"; + rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; + sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + }; + + propagatedBuildInputs = [ + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "cons" ]; + + meta = with lib; { + description = "An implementation of Lisp/Scheme-like cons in Python"; + homepage = "https://github.com/pythological/python-cons"; + changelog = "https://github.com/pythological/python-cons/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 6c1c5de2c5..265504938d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -4,6 +4,7 @@ , pythonOlder , fetchpatch , fetchPypi +, setuptools , setuptools-scm , toml , importlib-metadata @@ -11,28 +12,24 @@ , lxml , mock , pytestCheckHook +, importlib-resources }: buildPythonPackage rec { pname = "cssutils"; - version = "2.3.0"; + version = "2.4.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; + hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - # fix tests for python3.10 - (fetchpatch { - url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch"; - sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ="; - }) - ]; - nativeBuildInputs = [ + setuptools setuptools-scm toml ]; @@ -46,6 +43,8 @@ buildPythonPackage rec { lxml mock pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; disabledTests = [ @@ -53,11 +52,6 @@ buildPythonPackage rec { "test_parseUrl" "encutils" "website.logging" - ] ++ lib.optionals (pythonOlder "3.9") [ - # AttributeError: module 'importlib.resources' has no attribute 'files' - "test_parseFile" - "test_parseString" - "test_combine" ]; pythonImportsCheck = [ "cssutils" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 250d337a07..2ae38e5051 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "10.1.0"; + version = "10.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ad28e7311b2023391f2278b7649828decdd9d9599848e18845eb4ab1b2d01936"; + sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix new file mode 100644 index 0000000000..96a4eccbc5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: + +buildPythonPackage rec { + pname = "dasbus"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + }; + + propagatedBuildInputs = [ pygobject3 ]; + checkInputs = [ dbus ]; + + meta = with lib; { + homepage = "https://github.com/rhinstaller/dasbus"; + description = "DBus library in Python3"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} 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 0358083c3a..7af0eca747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -18,12 +18,11 @@ , pythonOlder , pyyaml , toolz -, withExtraComplete ? false }: buildPythonPackage rec { pname = "dask"; - version = "2022.01.0"; + version = "2022.02.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,8 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-HlVvnhEDzefzv9xchlXl9d4KCumoAqoYUWmIiCXLJyM= -"; + hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; }; propagatedBuildInputs = [ @@ -47,9 +45,6 @@ buildPythonPackage rec { jinja2 bokeh numpy - ] ++ lib.optionals (withExtraComplete) [ - # infinite recursion between distributed and dask - distributed ]; doCheck = true; @@ -105,6 +100,10 @@ buildPythonPackage rec { "dask.diagnostics" ]; + passthru.extras-require = { + complete = [ distributed ]; + }; + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; 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 f77b279eb6..d242c59acd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.9"; + version = "9.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/I0yMrh2OinvSeMX8C10Y64FuD/nr3dOKIN3Pkb3Zrs="; + sha256 = "sha256-OR3TXO6IzqwqbBbfFf+FGIUbwTa0DoKry84e1hL0I3Q="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix index b87ce1803c..145342a60a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,27 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , xmltodict }: buildPythonPackage rec { - version = "0.9.8"; - pname = "DataModelDict"; + pname = "datamodeldict"; + version = "0.9.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "65c36954efa17449c69a4d8cb11c9273593ef01428cd77a609ee134eba771550"; + pname = "DataModelDict"; + inherit version; + hash = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; - propagatedBuildInputs = [ xmltodict ]; + propagatedBuildInputs = [ + xmltodict + ]; # no tests doCheck = false; + pythonImportsCheck = [ + "DataModelDict" + ]; + meta = with lib; { - homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; + homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index d4515b0648..152582f671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { param pyct scipy - ]; + ] ++ dask.extras-require.complete; checkInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix index 92c2c27de2..71e302a8b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decopatch/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "decopatch"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8="; + hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA="; }; nativeBuildInputs = [ 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 08e38f2a14..ee86418a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,20 +19,17 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.12.0"; - disabled = pythonOlder "3.6"; + version = "2022.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "c6119a2cf1fb2d8ac60337915bb9a790af6530afcb5d7a809a3308323b874714"; + hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "dask == 2021.11.2" "dask" - ''; - propagatedBuildInputs = [ bokeh click @@ -49,10 +46,17 @@ buildPythonPackage rec { zict ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "dask == 2022.02.0" "dask" + ''; + # when tested random tests would fail and not repeatably doCheck = false; - pythonImportsCheck = [ "distributed" ]; + pythonImportsCheck = [ + "distributed" + ]; meta = with lib; { description = "Distributed computation in Python"; 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 4cb23d989f..4bddb62bdd 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 @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; + sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677"; }; buildInputs = [ 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 9f04f25f46..c9a0f10947 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 @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7"; + sha256 = "sha256-zYmHz45N024BmtPoolxYm8S0EMpKZs38vlwlpRenwK0="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index eb24edb4bf..57c752725d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.2"; + version = "4.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo="; + hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA="; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 4c616bdeb2..d84a542d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "30b10e7732395c44d21980f773214d2b9bdeadf2a6c6809cd1a7c9abe272873c"; + sha256 = "sha256-dTI1KKe5EIQ7h5GUdG8OvDSBxK2fNU3i3RYhYGYvuVo="; }; 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 8f53ff4ebb..2e2490568e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.27.0"; + version = "11.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo="; + sha256 = "sha256-xNenBmeCRIYxQqAkV8IDpPpIHyVAYJs1jAFr8w1tz2Y="; }; propagatedBuildInputs = [ 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 bf78fec5e5..f273b1a642 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 @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.7.2"; + version = "6.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4="; + sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index 05625f9283..6e30203ad0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; + hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts="; }; nativeBuildInputs = [ @@ -36,15 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/gwww/elkm1/pull/45 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch"; - sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9"; - }) - ]; - pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix new file mode 100644 index 0000000000..bfb4552732 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cons +, multipledispatch +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "etuples"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "etuples"; + rev = "35d760ceb64ec318f302a6e4d3a4a80feda97a9e"; + sha256 = "sha256-CXD8MhsdWYAcG5WDVTT/A2HDtiO1xfQbrwlYVnxXpBU="; + }; + + propagatedBuildInputs = [ + cons + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "etuples" ]; + + meta = with lib; { + description = "Python S-expression emulation using tuple-like objects"; + homepage = "https://github.com/pythological/etuples"; + changelog = "https://github.com/pythological/etuples/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ Etjean ]; + }; +} 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 ec14e956c3..6f0a39a7b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.73.0"; + version = "0.75.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "0v3w9b8107b3g2rgy5y58f0p64inhwl1j9cybp627myypwpqx4b7"; + sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso="; }; propagatedBuildInputs = [ 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 4783b8d33c..9d0ce4f2ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.3.27"; + version = "1.3.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = version; - sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc="; + sha256 = "sha256-V5mJJqWsCy8Wes8VzEkCKeb2/1ahvtbUO80R8IFLvNU="; }; propagatedBuildInputs = [ 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 2164bc93f6..cd1b4e3bba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.0"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix index 1f8c6983cb..f514cf3253 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -1,25 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, substituteAll -, pytestCheckHook , ffmpeg , future -, pytest-runner , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "ffmpeg-python"; version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kkroening"; repo = "ffmpeg-python"; rev = version; - sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f"; + hash = "sha256-Dk3nHuYVlIiFF6nORZ5TVFkBXdoZUxLfoiz68V1tvlY="; }; + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + patches = [ (substituteAll { src = ./ffmpeg-location.patch; @@ -27,14 +40,23 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ + "ffmpeg" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test__output__video_size" + ]; meta = with lib; { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; - maintainers = [ maintainers.AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix new file mode 100644 index 0000000000..e2c53c3e41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, fixtures +, jsonpatch +, netaddr +, prettytable +, python-dateutil +, pytestCheckHook +, requests +, requests-mock +, six +, sphinx +, testtools +}: + +buildPythonPackage rec { + pname = "fiblary3-fork"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0"; + }; + + propagatedBuildInputs = [ + jsonpatch + netaddr + prettytable + python-dateutil + requests + six + ]; + + checkInputs = [ + fixtures + pytestCheckHook + requests-mock + testtools + ]; + + pythonImportsCheck = [ "fiblary3" ]; + + meta = with lib; { + homepage = "https://github.com/graham33/fiblary"; + description = "Fibaro Home Center API Python Library"; + license = licenses.asl20; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix index f8fc454e05..3cd8eef932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -49,14 +49,6 @@ buildPythonPackage rec { disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # Assert not true - "test_no_append_driver_cannot_append" - ] ++ lib.optionals stdenv.isAarch64 [ - # https://github.com/Toblerity/Fiona/issues/1012 the existence of this - # as a bug hasn't been challenged and other distributors seem to also - # be skipping these tests on aarch64, so this is not unique to nixpkgs. - "test_write_or_driver_error" - "test_append_or_driver_error" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch new file mode 100644 index 0000000000..234bf0cb37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch @@ -0,0 +1,48 @@ +From 716fcfa3203bc881b543916bdb9a17460951cd26 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Fri, 26 Nov 2021 07:13:32 -0600 +Subject: [PATCH] Fixing paths on tests + +--- + tests/maintest.py | 7 ++++++- + tests/speedtest.py | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/tests/maintest.py b/tests/maintest.py +index 0e24ca4..3484437 100644 +--- a/tests/maintest.py ++++ b/tests/maintest.py +@@ -1,6 +1,11 @@ + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + info = fleep.get(file.read(128)) + + assert info.type == ["raster-image"] +diff --git a/tests/speedtest.py b/tests/speedtest.py +index 89338ab..829d563 100644 +--- a/tests/speedtest.py ++++ b/tests/speedtest.py +@@ -1,7 +1,12 @@ + import time + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + stream = file.read(128) + + times = [] +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix new file mode 100644 index 0000000000..04b6073251 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fleep/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "fleep"; + version = "1.0.1"; + + # Pypi version does not have tests + src = fetchFromGitHub { + owner = "floyernick"; + repo = "fleep-py"; + rev = "994bc2c274482d80ab13d89d8f7343eb316d3e44"; + sha256 = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; + }; + + patches = [ + ./0001-Fixing-paths-on-tests.patch + ]; + + checkPhase = '' + ${python.interpreter} tests/maintest.py + ${python.interpreter} tests/speedtest.py + ''; + + pythonImportsCheck = [ "fleep" ]; + + meta = with lib; { + description = "File format determination library"; + homepage = "https://github.com/floyernick/fleep-py"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} 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 418c7cf42f..1a53b46c44 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 @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , requests-mock , pythonOlder @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "cnico"; repo = pname; rev = version; - sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn"; + sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI="; }; nativeBuildInputs = [ @@ -40,17 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch"; - sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6"; - }) + pythonImportsCheck = [ + "flipr_api" ]; - pythonImportsCheck = [ "flipr_api" ]; - meta = with lib; { description = "Python client for Flipr API"; homepage = "https://github.com/cnico/flipr-api"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 873b26a29f..f07efbee7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.26"; + version = "0.28.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-t8SE+TU9OW/iQHVLbEdTgX4azXendKSgJQ4/QpDSkL8="; + sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I="; }; propagatedBuildInputs = [ 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 7c04c54d42..7830cb1171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737"; + sha256 = "sha256-aHtjLHdc2/s3ppF8fz8qFAqxwEKMZJJAFNlBaZ7FAb4="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 9d538214c4..fb84371e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.10.1"; + version = "2022.01.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-LgrOHBXKs2bEgtgrdHb1OEhOeQ5Rbgr6X5YtgiqiCH0="; + sha256 = "sha256-iPe2q9hY3ZRIKQGpxrHda3t9G0AtbtohVcWdnAzlzCo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix index dd517a2f54..615bf3ebe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.2.14.1"; + version = "2022.3.4"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-18uBJgNGNyEjMjUOyEkMuVcy02UGsCQxiljO4ufeD9o="; + sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix index 01ff36e637..cc89020e44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -1,22 +1,23 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, pythonOlder , poetry-core -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "3.2.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = "v${version}"; - sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; + sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; }; postPatch = '' @@ -35,7 +36,9 @@ buildPythonPackage rec { # The only test requires network access doCheck = false; - pythonImportsCheck = [ "garages_amsterdam" ]; + pythonImportsCheck = [ + "garages_amsterdam" + ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix index 66d05f2a35..518226f34d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -18,15 +18,16 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.10.1"; + version = "2022.01.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = version; - sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M="; + hash = "sha256-wNeK1GdjK9GKaaECcFeBLjFf/h3MbLI5e4MX0UNoTqE="; }; propagatedBuildInputs = [ @@ -47,11 +48,15 @@ buildPythonPackage rec { vcrpy ]; - disabledTests = [ - # Tests wants to communicate with the Link-local address - "test_GoogleCredentials_None" + disabledTestPaths = [ + # Tests require a running Docker instance + "gcsfs/tests/test_core.py" + "gcsfs/tests/test_mapping.py" + "gcsfs/tests/test_retry.py" ]; + pytestFlagsArray = [ "-x" ]; + pythonImportsCheck = [ "gcsfs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 180624ea81..305fd93c96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE="; + sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index b74ef29e54..a4c9d2d746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.4.23"; + version = "0.4.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y8L0krMSAOFP97j5QQGiJJMhzRidhMgoHGsMYMyUdd8="; + sha256 = "sha256-20l3zNOvZVGucm1SFzmSjkj3iOXPQhp4T5sInTGO/aQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix index 8c4eb2cdf1..64fbf06611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix @@ -6,17 +6,21 @@ , pytz , requests , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geojson-client"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; rev = "v${version}"; - sha256 = "sha256-8eSLimCgFRn3cHTz5TE9fAUAbwFO72b23C0lg6fVOLQ="; + sha256 = "sha256-7EhdIfVM6d5fp6k+RdX6z33O5sZGeF/ThNkSXL8EjE8="; }; propagatedBuildInputs = [ @@ -26,9 +30,13 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "geojson_client" ]; + pythonImportsCheck = [ + "geojson_client" + ]; meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 9328ac17aa..fc19ea105c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; - version = "0.3"; + version = "0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y="; + hash = "sha256-Cz0PRcGReAE0mg04ktCUaoLqPTjvyU1TiB/Pdz7o7zo="; }; propagatedBuildInputs = [ 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 ab42e8fffb..e9587d0b76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "v${version}"; - sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk"; + sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; }; # Patch path to GLFW shared object diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 98339c851c..ef809dcf70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.4.2"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = version; - hash = "sha256-QdeEaOP+gPWMqtUofTwrHRqLBtjG8Kta0LfZtccTjCQ="; + hash = "sha256-doyKTGPm4tpmLrXQgsDOGklG54HSN8VFCAXa4Q73Uos="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e25662b57..7a138eb0b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.7.1"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5"; + sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 6cb405d3c1..03022877a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -10,15 +10,19 @@ , proto-plus , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.6.0"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf"; + hash = "sha256-NHjHzZm20jDdIg91Zr0ytM0V2sHAmZUF0hlD1C9DeSM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 1d5d1b9a68..21fcf88e8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.34.0"; + version = "2.34.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K3XhnlPIWSRBIBgMcqGqmehJFW48BBMHGkv7rgt0xTA="; + sha256 = "sha256-gzWuWmcSYeuBcFQpVUNwsLVGSF2+h4JulN4bIkUBWaM="; }; 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 6ef36c1779..779fbb4e6e 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 @@ -8,15 +8,19 @@ , mock , proto-plus , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.5.1"; + version = "2.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zqyLJX3ufjIpdiS7Qw85R6K/2p2m1KbYtmH2DH/r0nE="; + hash = "sha256-z6qhLNPfZnFJE6CStAByqxHBv3Itfzn1FtxDE+JPci8="; }; propagatedBuildInputs = [ @@ -51,6 +55,6 @@ buildPythonPackage rec { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf9e8552ae..a095b9a04f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,19 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, libcst +, google-api-core +, grpc-google-iam-v1 +, proto-plus +, pytest-asyncio +, pytestCheckHook +, mock +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.2"; + version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; + hash = "sha256-5ehghcpPZTlw8dOJ74pkB4k0g79wHLh+zj3fLCOR4Rc="; }; - propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + mock + ]; - pythonImportsCheck = [ "google.cloud.datacatalog" ]; + pythonImportsCheck = [ + "google.cloud.datacatalog" + ]; meta = with lib; { description = "Google Cloud Data Catalog API API client library"; 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 3badd79612..66cca84e9c 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 @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "3.2.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f"; + sha256 = "sha256-x4ejr6qj5z4yKOx0pIqK13oVzsKj+uQ43Q5VN48jaFQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; 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 0ea9c3e5e3..30cf1ae31a 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 @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4a6f04112f2685a0a5cd8c7cb7946572bb7e0f6ca7cbe0088514006fca8594ca"; + sha256 = "sha256-4OwOEb+E+doiQ+gm3f4O+O88PXwFWINfTpRvOlzMuCA="; }; 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 d2e3abef82..90e2298578 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 @@ -9,20 +9,34 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.6.0"; + version = "3.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "20abce8d8d3939db243cbc0da62a73ff1a4e3b3b341f7ced0cfeb5e2c4a66621"; + hash = "sha256-zDGLdyBvm2haNaWRanHkRJZqHl+yvBuHRxCGqXYO7Ow="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials 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 3a4402beed..c0130e506a 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,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.5.1"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b26294d02b14b40586eceb099a0e3a74265ae10a3f46fd49890cac55ad5f861f"; + sha256 = "sha256-iLfXzZ3LCNlkgsMilf8TW5ZXgdSBWRgJtuL8zIpUlns="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index 507ba6aef1..063ba06660 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "cb31a864be75c47880748b6c81f0c57cbce190a87e402ce32b2b772be2dba5fa"; + sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index b817c50ad5..c8adfc5446 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.3.2"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409"; + sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 4872f7ac44..9a4a6a83d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -9,20 +9,34 @@ , pytestCheckHook , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.8.0"; + version = "2.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; + hash = "sha256-6Xu07QBrVGQOwxi65KZaYFKF3DJ/1uc+zC+NUKqJeWM="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pandas pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pandas + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 5bada28d01..f30c3f35aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "cdb2d6878c426ed34af8950b052845a76b0f5fab3f96a2ec5dc80be994ca5cf8"; + sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 3ce5f92fe7..1756aad3d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.9.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "872774c4791b15d59d866fd965c780beac2772f335ded4a0047e2d844d988f30"; + sha256 = "sha256-1emoPnXxKRLzMQe+/ojTGvt2sYQJLSwu6N3C06p0T00="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; 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 aa49340f24..ef76b37835 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 @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.5.1"; + version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713"; + hash = "sha256-i3jgEaAJ0zEaJWtpzhOe23CtpUpt1ON4gXnVvSG8fTI="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.redis" 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 98c9f31632..e35349d8e8 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 @@ -7,20 +7,32 @@ , grpc-google-iam-v1 , proto-plus , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.3"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; + hash = "sha256-InkkAtqK5f1oqUK0Nsxc2PYt5JWBlB3ElGVNs5IJV/Q="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index b66091c15b..6782e30e78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "e8a3fb7c2a1595f59923661c568667d1ba40fcaaa4dd55fe8b1f5e54871e9460"; + sha256 = "sha256-G2vyhj2pbNywGE2/QTyNviYQOcsAj4KR8vIcGhvM5e8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index e982aefae5..d49eb3cf33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.8.0"; + version = "1.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320"; + hash = "sha256-qtaZs6mgcYeEEdf6KGQNx7c+RP8SqSNyTCZuhTVAq38="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.securitycenter" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 5f2737912e..097da84210 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -7,25 +7,37 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.12.0"; + version = "2.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7"; + hash = "sha256-NO2oxVszbm2KYiN2NCn3edIyBx+E++sttJTgZd/yXzQ="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; - pytestFlagsArray = [ - # requrire credentials - "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" - "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + disabledTestPaths = [ + # Requrire credentials + "tests/system/gapic/v1/test_system_speech_v1.py" + "tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" ]; pythonImportsCheck = [ 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 c1b58c0e1c..341990868e 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.7.2"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys="; + sha256 = "sha256-/iEexbBw/lBhD+7BawaYHQpDB98jxqJB4hkmUaFHJN8="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index c2ab6afafa..4e52f5f3fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI="; + sha256 = "sha256-5uFtHqZJgouUBgkGNqSBFQrWaU2Gm06icDjKx57HY94="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; 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 4032de9d7c..6c17d6cb99 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "fd4cb8a9efa20598c35a4e6f7ac013a04868e37d7d4ff4ec3080f528b06f8a0e"; + sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; 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 956f27e2e5..c3008caaf6 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 @@ -9,15 +9,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.6.1"; + version = "3.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "38772cc60ef4315d25a7dbeef5ddab9e75674722cb4500bc69b295e5d0af6a97"; + hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y="; }; 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 db6027f3a1..629220fe37 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 @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7b735f623d6c3c80d1d40fa491bfe1776a5369d7b240dddab522fd0076d97b1d"; + sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index c67f910321..312d8ec3b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.6.3"; + version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491"; + hash = "sha256-antpKF6egHtya4g9sKuQLQepz1QRLQ6LiCdpfYBsDh8="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.vision" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 521d6c49f1..c7730e5138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "392a21dd238958eb7f480d056ed24110be22808cf4474939db40df0ade2910f3"; + sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; 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 5d5d2fda18..0b81aa71eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.2.1"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-se37mIZ8n6Jap68S1kaGZbg8UytzSe/6uAWgJ+qLvuU="; + sha256 = "sha256-H02LFRlnZv34qGD9LPqmGEE4cH7F+SHNGDQGel39Lbc="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 6ae0dce79c..afcbe157a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.4.3"; + version = "0.5.1"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4="; + sha256 = "sha256-PVQa6JmBnToXuL/wNkYO0b+K1e9yrQgRUzWNUbFN5mM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix new file mode 100644 index 0000000000..1288471c6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gridnet"; + version = "4.0.0"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-gridnet"; + rev = "v${version}"; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gridnet" ]; + + meta = with lib; { + description = "Asynchronous Python client for NET2GRID devices"; + homepage = "https://github.com/klaasnicolaas/python-gridnet"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 741882bdbd..466b3ae477 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "5.2.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f"; + sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; 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 656b89ab7b..c1baa8a3ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.35.0"; + version = "0.36.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-VgtdnKj+TlAsFr1un6eMlYfumap4mwE8H4kkKAUrxfo="; + sha256 = "sha256-yBkWBIT+FsOk9g3NgBTI3q4hN/dL6gI5UkoZnRcS3Jw="; }; 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 2e3be091ce..e7732e1f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; + sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE="; }; postPatch = '' @@ -41,6 +41,8 @@ buildPythonPackage rec { warrant ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ asynctest pytest-aiohttp 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 27c2167ff1..9b1264e738 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 @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.4.1"; + version = "10.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2"; + sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw="; }; checkInputs = [ 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 ecefce19ae..dd97b47007 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; + sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w="; }; propagatedBuildInputs = [ 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 3ce0f068fe..ee8b897154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -9,10 +9,15 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + postPatch = '' + substituteInPlace setup.py --replace "lark-parser" "lark" + ''; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + pytestFlagsArray = [ "-v" ]; # tests are fairly slow, prevents timeout due to no stdout printing pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 64ecd3c496..6345eebad1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.14.0"; + version = "3.15.0"; src = fetchPypi { inherit pname version; - sha256 = "695c4125436f4f8354a67bc85af9ac306b66911c75d19ade25072dd436b55c4e"; + sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY="; }; 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 new file mode 100644 index 0000000000..05c24ec7c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix @@ -0,0 +1,31 @@ +{ lib +, python +, fetchFromGitHub +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "icnsutil"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "relikd"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + }; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} tests/test_icnsutil.py + ${python.interpreter} tests/test_cli.py + ''; + + meta = { + homepage = "https://github.com/relikd/icnsutil"; + description = "Create and extract .icns files."; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.reckenrode ]; + }; +} 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 949ae27273..9f2a066ebd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.10"; + version = "2.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a12a4PvACkB+zpJts6syDqMPafjhZp1UWnob9UiKMbM="; + sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; }; checkInputs = [ 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 4fe56c6161..d351f1ca7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ --replace "WTForms>=2.3.1,<2.4" "WTForms" @@ -106,7 +107,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ihatemoney" ]; + pythonImportsCheck = [ "ihatemoney" ]; disabledTests = [ "test_notifications" # requires running service. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index 59de3b3f3f..866721b09f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.0"; + version = "0.51.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk="; + hash = "sha256-ppxQtFK7U006z7qonm3B5gN99CHB9mEX3l0XjrhZQo8="; }; checkInputs = [ 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 9eb9bd48d4..85456fcc15 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 @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.25.0"; + version = "1.26.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0anziqlczzc9qmz1mrk8yapn0pc18wz2pknyghyj5qpym3w2azas"; + hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; }; propagatedBuildInputs = [ @@ -38,12 +40,14 @@ buildPythonPackage rec { # requires influxdb server doCheck = false; - pythonImportsCheck = [ "influxdb_client" ]; + pythonImportsCheck = [ + "influxdb_client" + ]; meta = with lib; { description = "InfluxDB 2.0 Python client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix index 5418b237d1..c89517f189 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,4 +1,5 @@ { lib +, aenum , aiohttp , buildPythonPackage , fetchFromGitHub @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "0.9.9"; + version = "0.9.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-oI4iGnfitou8/Jhe7K4rnSPnmddfO+6FLZzqgNmaPV8="; + hash = "sha256-eXXcPowLbIsjPXul2Un0LTBPLbDhpEqfUg7pPR22NHM="; }; propagatedBuildInputs = [ + aenum aiohttp pydantic requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 51b76fc532..aa7cc22b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -9,23 +9,26 @@ , ipython , jupyter-client , ipykernel +, packaging +, psutil , tornado +, tqdm , isPy3k , futures ? null }: buildPythonPackage rec { pname = "ipyparallel"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73"; + sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster 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 cee9868cfa..432f83e75c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -26,7 +26,7 @@ , testpath }: -buildPythonPackage rec { +buildPythonPackage (rec { pname = "ipython"; version = "8.0.1"; format = "pyproject"; @@ -82,4 +82,8 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + disabledTests = [ + "test_clipboard_get" # uses pbpaste + ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index e43db60fb1..50e171feb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.9"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; + sha256 = "c9e6c1dcaa9dff195429373cf2beb3117f30b3fca43d7db5aec5a2d1f6f59784"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index d6e4332fde..67b547b724 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2021.1"; + version = "2022.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; + sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; }; postConfigure = '' 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 c91b6e4852..d5e5365401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -1,8 +1,10 @@ { lib , absl-py +, blas , buildPythonPackage , fetchFromGitHub , jaxlib +, lapack , numpy , opt-einsum , pytestCheckHook @@ -12,6 +14,9 @@ , typing-extensions }: +let + usingMKL = blas.implementation == "mkl" || lapack.implementation == "mkl"; +in buildPythonPackage rec { pname = "jax"; version = "0.3.1"; @@ -59,6 +64,16 @@ buildPythonPackage rec { "tests/" ]; + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 + disabledTests = lib.optionals usingMKL [ + "test_custom_linear_solve_cholesky" + "test_custom_root_with_aux" + "testEigvalsGrad_shape" + ]; + pythonImportsCheck = [ "jax" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix index a9100e061d..5b25b5c18a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix @@ -15,13 +15,10 @@ buildPythonPackage rec { sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; }; - nativeBuildInputs = [ - pbr - ]; - propagatedBuildInputs = [ attrs jsonpickle + pbr ]; checkInputs =[ 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 new file mode 100644 index 0000000000..ffcde4a5b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyter_server +}: + +buildPythonPackage rec { + pname = "jupyter-lsp"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; + }; + + propagatedBuildInputs = [ + jupyter_server + ]; + # tests require network + doCheck = false; + pythonImportsCheck = [ "jupyter_lsp" ]; + + meta = with lib; { + description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server"; + homepage = "https://pypi.org/project/jupyter-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} + 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 47f5f8e584..cd5e1e0f76 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 @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-server-mathjax"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451"; + sha256 = "sha256-ZNlsjm3+btunN5ArLcOi3AWPF1FndsJfTTDKJGF+57M="; }; 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 new file mode 100644 index 0000000000..ad6286f4de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-lsp +}: + +buildPythonPackage rec { + pname = "jupyterlab-lsp"; + version = "3.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8="; + }; + + propagatedBuildInputs = [ + jupyterlab + jupyter-lsp + ]; + # No tests + doCheck = false; + pythonImportsCheck = [ "jupyterlab_lsp" ]; + + meta = with lib; { + description = "Language Server Protocol integration for Jupyter(Lab)"; + homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} 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 21158ebb53..90c99c16b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.9"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zd3DTl2hp2RgbjjE9wz51KwcBRgoE88Kst/qMSxwESQ="; + sha256 = "sha256-x6GZe+v1SH+MF1h/UZA5ElAU0SLN1dYL7/rUsmbaMw8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch index 4ebe5472b4..597907c14b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 66e6d49..78f7b42 100644 +index 17c7032..12ed398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,23 +1,6 @@ +@@ -1,87 +1,12 @@ cmake_minimum_required(VERSION 3.13.0) project(kaldi_binaries) @@ -24,9 +24,8 @@ index 66e6d49..78f7b42 100644 -endif() - set(BINARIES - tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} - tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} -@@ -29,63 +12,6 @@ set(LIBRARIES + ) + set(LIBRARIES src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} ) @@ -87,30 +86,33 @@ index 66e6d49..78f7b42 100644 - message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") - # set(KALDI_BRANCH "origin/master") -endif() - +- message("MAKE_EXE = ${MAKE_EXE}") message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") -@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + message("PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}") +@@ -94,65 +19,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh -if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) -- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- # set(STRIP_DST_COMMAND find ${DST} [[[other specifiers]]] | xargs strip) - if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") - list(APPEND STRIP_LIBS_COMMAND -x) -- list(APPEND STRIP_DST_COMMAND -x) +- # list(APPEND STRIP_DST_COMMAND -x) - endif() +- # set(STRIP_LIBS_COMMAND true) +- set(STRIP_DST_COMMAND true) - ExternalProject_Add(kaldi - GIT_CONFIG advice.detachedHead=false - GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git - GIT_TAG ${KALDI_BRANCH} - GIT_SHALLOW TRUE -- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && sed -i.bak -e "s/openfst_add_CXXFLAGS = -g -O2/openfst_add_CXXFLAGS = -g0 -O3/g" tools/Makefile && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ - BUILD_IN_SOURCE TRUE -- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly - LIST_SEPARATOR " " -- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} && ${STRIP_DST_COMMAND} - ) -endif() - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch index 60f50d707d..3a45ea7e10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -1,5 +1,5 @@ diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py -index 0b70c7f..21e1d62 100644 +index 823f997..3850336 100644 --- a/kaldi_active_grammar/utils.py +++ b/kaldi_active_grammar/utils.py @@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' @@ -8,10 +8,10 @@ index 0b70c7f..21e1d62 100644 -exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) +exec_dir = '/' - library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] - subprocess_seperator = '^&' if platform == 'windows' else ';' -@@ -89,13 +89,13 @@ class ExternalProcess(object): + import ush + +@@ -87,13 +87,13 @@ class ExternalProcess(object): shell = ush.Shell(raise_on_error=True) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix index d5a906dd73..46fc619b4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { nativeBuildInputs = [ scikit-build cmake ]; propagatedBuildInputs = [ ush requests numpy cffi ]; + doCheck = false; # no tests exist + meta = with lib; { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index 71170ac534..ab092fc256 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder }: buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny"; + sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; }; propagatedBuildInputs = [ @@ -28,7 +32,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.config_extractor" ]; + + pythonImportsCheck = [ + "karton.config_extractor" + ]; meta = with lib; { description = "Static configuration extractor for the Karton framework"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 65bb683be2..f976e3fedb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , mwdblib +, pythonOlder }: buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.0.1"; + version = "unstable-2022-02-22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841"; + rev = "1afa32251b4826eac4386596b4a20f295699faec"; + hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ="; }; propagatedBuildInputs = [ @@ -21,14 +25,12 @@ buildPythonPackage rec { mwdblib ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "mwdblib==3.4.0" "mwdblib" - ''; - # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.mwdb_reporter" ]; + + pythonImportsCheck = [ + "karton.mwdb_reporter" + ]; meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; 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 6c29a66252..8fc32539d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -3,17 +3,18 @@ , fetchFromGitHub , python , regex +, pytestCheckHook }: buildPythonPackage rec { pname = "lark"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n"; + sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; }; # Optional import, but fixes some re known bugs & allows advanced regex features @@ -26,15 +27,11 @@ buildPythonPackage rec { "lark.grammars" ]; - checkPhase = '' - runHook preCheck + checkInputs = [ pytestCheckHook ]; - # Official way to run the tests. Runs unittest internally. - # pytest produces issues with some test resource paths (relies on __main__) - ${python.interpreter} -m tests - - runHook postCheck - ''; + disabledTestPaths = [ + "tests/test_nearley/test_nearley.py" # requires unpackaged Js2Py library + ]; meta = with lib; { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; 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 c23b9df7cd..21a58e7e98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0="; + sha256 = "sha256-ftXW4/RUbl48KEBpH53cVoePkUo1pQBg31/KKybUthQ="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localimport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localimport/default.nix index 3c41618d5b..c5bc45aae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localimport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localimport/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "localimport"; - version = "1.7.3"; + version = "1.7.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo="; + hash = "sha256-8UhaZyGdN/N6UwR7pPYQR2hZCz3TrBxr1KOBJRx28ok="; }; pythonImportsCheck = [ "localimport" ]; 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 new file mode 100644 index 0000000000..b89fcb2533 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, multipledispatch +, pytestCheckHook +, pytest-html +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "logical-unification"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "unification"; + rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; + sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + }; + + propagatedBuildInputs = [ + toolz + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + pytest-benchmark # Needed for the `--benchmark-skip` flag + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "unification" ]; + + meta = with lib; { + description = "Straightforward unification in Python that's extensible via generic functions"; + homepage = "https://github.com/pythological/unification"; + changelog = "https://github.com/pythological/unification/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} 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 90494de822..ccbd70ff48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -10,16 +10,18 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8="; + sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; }; + format = "pyproject"; + propagatedBuildInputs = [ click desktop-notifier diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 23146a4f5a..ab609b597a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.12"; + version = "4.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AqpT2Mqo5bjmKsu6WzVw/+AUOaSwlDfmXO0ufB6uc8A="; + hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix index 251b69e8e6..987fe203ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Aqmz0KB26aDQ6hxItF7Qm2R14rak6Mge2fHoLK87/Ck="; + hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0="; extension = "zip"; }; 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 517d74563a..be1df56206 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "789f070f35424e89e4f2e2c007382250133cc48877627e37c5c463bcf4a1b58a"; + sha256 = "sha256-0iW7SWIxb+Ek4T26hru5EgBgXfqRh6zOR73GAgLFNyE="; }; propagatedBuildInputs = [ 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 44d37b988a..b1dd247987 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 @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4="; + sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY="; }; propagatedBuildInputs = [ attrs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 0af337bc13..2fd61bc5a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.85"; + version = "1.2.88"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-DFRnyWBQ3/g5NwZH5hoVYJfj3gN/UP57JvNSnNaqws4="; + sha256 = "sha256-iNDS1QjlDiXb89g7Gut+5ShbgtCCHBSJuQmXfHaTXB8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix index 909c224685..25d8d492dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -4,9 +4,7 @@ , fetchPypi , substituteAll , portmidi -, pygame , python-rtmidi -, rtmidi-python , pytestCheckHook }: @@ -27,9 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pygame python-rtmidi - rtmidi-python ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix new file mode 100644 index 0000000000..7452148e8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, cons +, multipledispatch +, etuples +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "minikanren"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "kanren"; + rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; + sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + }; + + propagatedBuildInputs = [ + toolz + cons + multipledispatch + etuples + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "kanren" ]; + + meta = with lib; { + description = "Relational programming in Python"; + homepage = "https://github.com/pythological/kanren"; + changelog = "https://github.com/pythological/kanren/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index f242ac69c2..4b75006bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.17"; + version = "0.2.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM="; + sha256 = "sha256-5bmuCbX4a69sP9SnHkB4OQrOHmFufUTlchHkgu6iBYk="; }; propagatedBuildInputs = [ 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 658470ec72..add6ee40de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -6,6 +6,7 @@ , six , flask , numpy +, scipy , pandas , python-dateutil , protobuf @@ -26,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.22.0"; + version = "1.23.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f680390715e436ae38cf7056ec91030fc9eb67cc631226f28ff9504fbe395add"; + sha256 = "03rfyhli7vbb1pz0zw75mdwj9pz3awxi3dadxn5glpwn953w6r5y"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config @@ -46,6 +47,7 @@ buildPythonPackage rec { six flask numpy + scipy pandas python-dateutil protobuf @@ -64,14 +66,7 @@ buildPythonPackage rec { importlib-metadata ]; - patches = [ - # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245 - (fetchpatch { - name = "relax-alembic-version.patch"; - url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch"; - sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0="; - }) - ]; + pythonImportsCheck = [ "mlflow" ]; meta = with lib; { homepage = "https://github.com/mlflow/mlflow"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index 16205286c0..ea95e2b2d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.1.12.1"; + version = "2022.1.19"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2"; + sha256 = "sha256-CGYYPpXRBvqf6GJYYZUARpzt4XFc5uAw91n21UInYpU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix index f6f176dcd5..8bed74a4d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.5.13"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "sha256-7o8mov8uV5ZrEYvX1qPSMT2T8Jb/1eV2MytU+1SEYfY="; + sha256 = "sha256-31ofLiBQjSMDtptgYF5rqS1bB5UDUbsbo25Nrk4WvIY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix index 53ca11459e..96c3f19339 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix @@ -8,18 +8,22 @@ , keyring , python , python-dateutil +, pythonOlder , requests }: buildPythonPackage rec { pname = "mwdblib"; - version = "3.4.1"; + version = "4.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY="; + sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; }; propagatedBuildInputs = [ @@ -38,7 +42,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "mwdblib" ]; + pythonImportsCheck = [ + "mwdblib" + ]; meta = with lib; { description = "Python client library for the mwdb service"; 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 4bb3714563..b224d40ee0 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 @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.1.2"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-p81Dk6Kv0MzHvexhM8Su5/yIpB+ZGBFqOtm0D18l26s="; + hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index bddccabf06..4f33912d3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.0"; + version = "1.21.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3P3dThYXpmtZ/cn+NCDS9RNtu6N48Vb78ZqmCdkTK50="; + hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix index 27da5b71b6..01d55d9997 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "neo"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0lw3r9p1ky1cswhrs9radc0vq1qfzbrk7qd00f34g96g30zab4g5"; + sha256 = "sha256-RE/xUnjdz541d4IOh4z2ufQiDOFFvxATyPMFNs9gk5s="; }; propagatedBuildInputs = [ numpy quantities ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix new file mode 100644 index 0000000000..345a77239b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, substituteAll +, ffmpeg +, libopus +, aiohttp +, aiodns +, brotli +, cchardet +, orjson +, pynacl +}: + +buildPythonPackage rec { + pname = "nextcord"; + version = "2.0.0a8"; + + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nextcord"; + repo = "nextcord"; + rev = version; + hash = "sha256-aYFY58zWZlZwW3xwa1iAK4w29AofKIkTyCjQ2nR8JrY="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + brotli + cchardet + orjson + pynacl + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "nextcord" + "nextcord.ext.commands" + "nextcord.ext.tasks" + ]; + + meta = with lib; { + description = "Python wrapper for the Discord API forked from discord.py"; + homepage = "https://github.com/nextcord/nextcord"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch new file mode 100644 index 0000000000..389637a188 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch @@ -0,0 +1,26 @@ +diff --git a/nextcord/opus.py b/nextcord/opus.py +index 97d437a3..755e1a5c 100644 +--- a/nextcord/opus.py ++++ b/nextcord/opus.py +@@ -213,7 +213,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') + _lib = libopus_loader(_filename) + else: +- _lib = libopus_loader(ctypes.util.find_library('opus')) ++ _lib = libopus_loader('@libopus@') + except Exception: + _lib = None + +diff --git a/nextcord/player.py b/nextcord/player.py +index bedefc5a..34de0459 100644 +--- a/nextcord/player.py ++++ b/nextcord/player.py +@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): + .. versionadded:: 1.3 + """ + +- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): ++ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): + piping = subprocess_kwargs.get('stdin') == subprocess.PIPE + if piping and isinstance(source, str): + raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") 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 79fd93d321..695c674e0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "21.0.0"; + version = "22.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo="; + sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; buildInputs = [ setuptools-scm toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix new file mode 100644 index 0000000000..c8f84cbf43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scipy +, numba +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "numba-scipy"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + }; + + propagatedBuildInputs = [ + scipy + numba + ]; + + postPatch = '' + substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "numba" ]; + + meta = with lib; { + description = "Extends Numba to make it aware of SciPy"; + homepage = "https://github.com/numba/numba-scipy"; + changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ Etjean ]; + }; +} 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 3c557eabb9..bbe9d4a01c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.14.0"; + version = "0.15.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-AFfbMeYxdZaIABhf4XpszhLvFuMJebhl07sv9kuiknA="; + sha256 = "sha256-HOMBVrAz3cP8r4w8CKXKy6epxf00myYJiKv1PQ1iqhQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch new file mode 100644 index 0000000000..27b87c0b2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch @@ -0,0 +1,57 @@ +From 79577371be21df40f1f6d4a4fe3453be6df9e93c Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Fri, 31 Dec 2021 10:03:25 +0200 +Subject: [PATCH 2/4] cmake: find system-distributed gtest + +--- + opensfm/src/CMakeLists.txt | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index c85aa6fb..640d47a6 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -52,12 +52,14 @@ if (OPENMP_FOUND) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + ++find_package(gflags REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) + find_package(Ceres) +-find_package(Gflags REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog REQUIRED) ++find_package(GTest REQUIRED) + + # Ceres2 exposes Ceres::ceres target. + # Ceres1 exposes just ceres. +@@ -100,20 +102,13 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) + + if (OPENSFM_BUILD_TESTS) + enable_testing() +- include_directories(third_party/gtest) +- add_definitions(-DCERES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +- +- add_library(gtest +- third_party/gtest/gmock_gtest_all.cc +- third_party/gtest/gmock_main.cc) +- target_include_directories(gtest PRIVATE ${GFLAGS_INCLUDE_DIR}) + + set(TEST_MAIN test_main) + add_library(${TEST_MAIN} testing_main.cc) + target_link_libraries(${TEST_MAIN} +- ${GFLAGS_LIBRARY} +- ${GLOG_LIBRARY} +- gtest) ++ gflags ++ glog::glog ++ GTest::gtest) + endif() + + ####### OpenSfM libraries ####### +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch new file mode 100644 index 0000000000..2815886e7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch @@ -0,0 +1,161 @@ +From 36820fbab1abeeebd99f14e368093e0e3f934ca7 Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Sat, 19 Feb 2022 02:37:54 +0200 +Subject: [PATCH 3/4] cmake: use system pybind11 + +--- + opensfm/src/CMakeLists.txt | 3 ++- + opensfm/src/bundle/CMakeLists.txt | 2 +- + opensfm/src/dense/CMakeLists.txt | 2 +- + opensfm/src/features/CMakeLists.txt | 1 - + opensfm/src/foundation/CMakeLists.txt | 1 - + opensfm/src/geo/CMakeLists.txt | 1 - + opensfm/src/geometry/CMakeLists.txt | 1 - + opensfm/src/map/CMakeLists.txt | 3 +-- + opensfm/src/robust/CMakeLists.txt | 1 - + opensfm/src/sfm/CMakeLists.txt | 1 - + 10 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index 640d47a6..6e391ffa 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -54,6 +54,8 @@ endif() + + find_package(gflags REQUIRED) + ++find_package(pybind11 REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) +@@ -82,7 +84,6 @@ else() + endif() + + ####### Third party libraries ####### +-add_subdirectory(third_party/pybind11) + add_subdirectory(third_party/akaze) + add_subdirectory(third_party/vlfeat) + +diff --git a/opensfm/src/bundle/CMakeLists.txt b/opensfm/src/bundle/CMakeLists.txt +index 7cd9cf74..307e963a 100644 +--- a/opensfm/src/bundle/CMakeLists.txt ++++ b/opensfm/src/bundle/CMakeLists.txt +@@ -52,7 +52,7 @@ target_link_libraries(pybundle PRIVATE + bundle + geometry + foundation +- pybind11) ++) + set_target_properties(pybundle PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/dense/CMakeLists.txt b/opensfm/src/dense/CMakeLists.txt +index cbebb5ea..2728749d 100644 +--- a/opensfm/src/dense/CMakeLists.txt ++++ b/opensfm/src/dense/CMakeLists.txt +@@ -23,7 +23,7 @@ endif() + + pybind11_add_module(pydense python/pybind.cc) + target_include_directories(pydense PRIVATE ${GLOG_INCLUDE_DIR}) +-target_link_libraries(pydense PRIVATE dense foundation pybind11) ++target_link_libraries(pydense PRIVATE dense foundation) + set_target_properties(pydense PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/features/CMakeLists.txt b/opensfm/src/features/CMakeLists.txt +index b131d30a..6db5b3f1 100644 +--- a/opensfm/src/features/CMakeLists.txt ++++ b/opensfm/src/features/CMakeLists.txt +@@ -22,7 +22,6 @@ target_link_libraries(pyfeatures + PRIVATE + features + foundation +- pybind11 + akaze + ) + set_target_properties(pyfeatures PROPERTIES +diff --git a/opensfm/src/foundation/CMakeLists.txt b/opensfm/src/foundation/CMakeLists.txt +index 40185227..9e0e45e7 100644 +--- a/opensfm/src/foundation/CMakeLists.txt ++++ b/opensfm/src/foundation/CMakeLists.txt +@@ -12,7 +12,6 @@ set(FOUNDATION_FILES + add_library(foundation ${FOUNDATION_FILES}) + target_link_libraries(foundation + PUBLIC +- pybind11 + ${OpenCV_LIBS} + ${OpenMP_libomp_LIBRARY} + Eigen3::Eigen +diff --git a/opensfm/src/geo/CMakeLists.txt b/opensfm/src/geo/CMakeLists.txt +index a9cbae02..75620d06 100644 +--- a/opensfm/src/geo/CMakeLists.txt ++++ b/opensfm/src/geo/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pygeo + PRIVATE + geo + foundation +- pybind11 + ) + set_target_properties(pygeo PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/geometry/CMakeLists.txt b/opensfm/src/geometry/CMakeLists.txt +index e6dda2c2..51bfd6c5 100644 +--- a/opensfm/src/geometry/CMakeLists.txt ++++ b/opensfm/src/geometry/CMakeLists.txt +@@ -48,7 +48,6 @@ target_link_libraries(pygeometry + PRIVATE + geometry + foundation +- pybind11 + ) + set_target_properties(pygeometry PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/map/CMakeLists.txt b/opensfm/src/map/CMakeLists.txt +index b6f67bcd..f869aa4c 100644 +--- a/opensfm/src/map/CMakeLists.txt ++++ b/opensfm/src/map/CMakeLists.txt +@@ -20,7 +20,7 @@ set(MAP_FILES + add_library(map ${MAP_FILES}) + target_link_libraries(map + PUBLIC +- pybind11 ++ pybind11::module + Eigen3::Eigen + PRIVATE + geo +@@ -39,7 +39,6 @@ target_link_libraries(pymap + map + geometry + bundle +- pybind11 + ) + + if (OPENSFM_BUILD_TESTS) +diff --git a/opensfm/src/robust/CMakeLists.txt b/opensfm/src/robust/CMakeLists.txt +index ce70749f..40bdf7a4 100644 +--- a/opensfm/src/robust/CMakeLists.txt ++++ b/opensfm/src/robust/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pyrobust + PRIVATE + robust + foundation +- pybind11 + ) + set_target_properties(pyrobust PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/sfm/CMakeLists.txt b/opensfm/src/sfm/CMakeLists.txt +index 98c28f41..7f56b791 100644 +--- a/opensfm/src/sfm/CMakeLists.txt ++++ b/opensfm/src/sfm/CMakeLists.txt +@@ -35,7 +35,6 @@ target_include_directories(pysfm PRIVATE ${GLOG_INCLUDE_DIR}) + target_link_libraries(pysfm + PRIVATE + foundation +- pybind11 + sfm + ) + set_target_properties(pysfm PROPERTIES +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch new file mode 100644 index 0000000000..f3cb2db00e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch @@ -0,0 +1,86 @@ +From c35b110a83286e7413d7309eb218eb43b52f7d48 Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Sat, 19 Feb 2022 14:36:12 +0200 +Subject: [PATCH 4/4] pybind_utils.h: conflicts with nixpkgs' pybind + +--- + opensfm/src/map/pybind_utils.h | 45 +++------------------------------- + 1 file changed, 3 insertions(+), 42 deletions(-) + +diff --git a/opensfm/src/map/pybind_utils.h b/opensfm/src/map/pybind_utils.h +index 817d1a16..3f98a2ab 100644 +--- a/opensfm/src/map/pybind_utils.h ++++ b/opensfm/src/map/pybind_utils.h +@@ -52,38 +52,6 @@ struct sfm_iterator_state { + }; + PYBIND11_NAMESPACE_END_(detail) + +-/// Makes an python iterator over the keys (`.first`) of a iterator over pairs +-/// from a first and past-the-end InputIterator. +-template ()).second), +- typename... Extra> +-iterator make_value_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::sfm_iterator_state +- state; +- +- if (!detail::get_type_info(typeid(state), false)) { +- class_(handle(), "iterator", pybind11::module_local()) +- .def("__iter__", [](state &s) -> state & { return s; }) +- .def("__next__", +- [](state &s) -> KeyType { +- if (!s.first_or_done) +- ++s.it; +- else +- s.first_or_done = false; +- if (s.it == s.end) { +- s.first_or_done = true; +- throw stop_iteration(); +- } +- return (*s.it).second; +- }, +- std::forward(extra)..., Policy); +- } +- +- return cast(state{first, last, true}); +-} +- + template ()).second)), +@@ -148,12 +116,13 @@ iterator make_ref_iterator(Iterator first, Sentinel last, Extra &&... extra) { + } + + /// Makes a python iterator from a first and past-the-end C++ InputIterator. +-template ()), + typename... Extra> + iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::iterator_state state; ++ typedef detail::iterator_state state; + + if (!detail::get_type_info(typeid(state), false)) { + class_(handle(), "iterator", pybind11::module_local()) +@@ -176,14 +145,6 @@ iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { + return cast(state{first, last, true}); + } + +-/// Makes an iterator over the keys (`.first`) of a stl map-like container +-/// supporting `std::begin()`/`std::end()` +-template +-iterator make_value_iterator(Type &value, Extra &&... extra) { +- return make_value_iterator(std::begin(value), std::end(value), +- extra...); +-} + template + iterator make_unique_ptr_value_iterator(Type &value, Extra &&... extra) { +-- +2.33.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix new file mode 100644 index 0000000000..dec998f451 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, cmake +, opencv4 +, ceres-solver +, suitesparse +, metis +, eigen +, pkg-config +, pybind11 +, numpy +, pyyaml +, lapack +, gtest +, gflags +, glog +, pytestCheckHook +, networkx +, pillow +, exifread +, gpxpy +, pyproj +, python-dateutil +, joblib +, repoze_lru +, xmltodict +, cloudpickle +, scipy +, sphinx +, matplotlib +, fpdf +, +}: + +let + ceresSplit = (builtins.length ceres-solver.outputs) > 1; + ceres' = + if ceresSplit + then ceres-solver.dev + else ceres-solver; +in +buildPythonPackage rec { + pname = "OpenSfM"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "mapillary"; + repo = pname; + rev = "79aa4bdd8bd08dc0cd9e3086d170cedb29ac9760"; + sha256 = "sha256-dHBrkYwLA1OUxUSoe7DysyeEm9Yy70tIJvAsXivdjrM="; + }; + patches = [ + (fetchpatch { + url = "https://github.com/mapillary/OpenSfM/pull/872/commits/a76671db11038f3f4dfe5b8f17582fb447ad7dd5.patch"; + sha256 = "sha256-4nizQiZIjucdydOLrETvs1xdV3qiYqAQ7x1HECKvlHs="; + }) + ./0002-cmake-find-system-distributed-gtest.patch + ./0003-cmake-use-system-pybind11.patch + ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch + ./fix-scripts.patch + ]; + postPatch = '' + rm opensfm/src/cmake/FindGlog.cmake + rm opensfm/src/cmake/FindGflags.cmake + + # HAHOG is the default descriptor. + # We'll test both HAHOG and SIFT because this is + # where segfaults might be introduced in future + echo 'feature_type: SIFT' >> data/berlin/config.yaml + echo 'feature_type: HAHOG' >> data/lund/config.yaml + ''; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; + buildInputs = [ + ceres' + suitesparse + metis + eigen + lapack + gflags + gtest + glog + pybind11 + ]; + propagatedBuildInputs = [ + numpy + scipy + pyyaml + opencv4 + networkx + pillow + matplotlib + fpdf + exifread + gpxpy + pyproj + python-dateutil + joblib + repoze_lru + xmltodict + cloudpickle + ]; + checkInputs = [ pytestCheckHook ]; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ + "-Bcmake_build" + "-Sopensfm/src" + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_reconstruction_incremental" + "test_reconstruction_triangulation" + ]; + + pythonImportsCheck = [ "opensfm" ]; + + meta = { + maintainers = [ lib.maintainers.SomeoneSerge ]; + license = lib.licenses.bsd2; + description = "Open source Structure-from-Motion pipeline from Mapillary"; + homepage = "https://opensfm.org/"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch new file mode 100644 index 0000000000..634820a327 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch @@ -0,0 +1,41 @@ +diff --git a/bin/opensfm b/bin/opensfm +index b5ee4b15..f05c0d1c 100755 +--- a/bin/opensfm ++++ b/bin/opensfm +@@ -1,12 +1,6 @@ +-#!/bin/bash ++#!/usr/bin/env bash + set -e + + DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) + +-if [ -x "$(command -v python3)" ]; then +- PYTHON=python3 +-else +- PYTHON=python +-fi +- +-"$PYTHON" "$DIR"/opensfm_main.py "$@" ++exec "$DIR"/opensfm_main.py "$@" +diff --git a/bin/opensfm_main.py b/bin/opensfm_main.py +index 31249e12..cc71560c 100755 +--- a/bin/opensfm_main.py ++++ b/bin/opensfm_main.py +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + import sys + from os.path import abspath, join, dirname + +diff --git a/setup.py b/setup.py +index 1120717f..438a16db 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,6 +71,7 @@ setuptools.setup( + scripts=[ + "bin/opensfm_run_all", + "bin/opensfm", ++ "bin/opensfm_main.py", + ], + package_data={ + "opensfm": [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orderedset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orderedset/default.nix index db9c265ef3..9910aefe1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orderedset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orderedset/default.nix @@ -14,5 +14,8 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; maintainers = [ maintainers.jtojnar ]; + # No support for Python 3.9/3.10 + # https://github.com/simonpercivall/orderedset/issues/36 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix index d5b9b7cf88..bbf95e98cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.10.24"; + version = "0.10.25"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = version; - hash = "sha256-zKugeGDcYDI4VKspJPWeZCBubTqMxxfOVQCuF4pC49E="; + hash = "sha256-AggrsXw9fUYfc38AiSDSoh7SIEf4gPf+LlAvrxZiFL4="; }; nativeBuildInputs = [ 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 5070b43515..3fd7c4e28c 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 @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.1.0"; + version = "11.2.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "8469c54544f1c0d7ac0a998477033eab13733b186d159554311c6132b43862e9"; + sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4="; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix index 8673c637ed..c5da10a30b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -9,39 +9,22 @@ , pyct , testpath , tqdm -, callPackage +, nodejs }: -let - node = callPackage ./node { }; -in buildPythonPackage rec { pname = "panel"; version = "0.12.6"; - # Don't forget to also update the node packages - # 1. retrieve the package.json file - # 2. nix shell nixpkgs#nodePackages.node2nix - # 3. node2nix - src = fetchPypi { - inherit pname version; - sha256 = "97e158e8eb941f88d71929407f9455c903b5e18d89969db8ce8af66036f46b53"; - }; + format = "wheel"; - # Since 0.10.0 panel attempts to fetch from the web. - # We avoid this: - # - we use node2nix to fetch assets - # - we disable bundling (which also tries to fetch assets) - # Downside of disabling bundling is that in an airgapped environment - # one may miss assets. - # https://github.com/holoviz/panel/issues/1819 - preBuild = '' - substituteInPlace setup.py --replace "bundle_resources()" "" - pushd panel - ln -s ${node.nodeDependencies}/lib/node_modules - export PATH="${node.nodeDependencies}/bin:$PATH" - popd - ''; + # We fetch a wheel because while we can fetch the node + # artifacts using npm, the bundling invoked in setup.py + # tries to fetch even more artifacts + src = fetchPypi { + inherit pname version format; + hash = "sha256-ARAbBM0QYZlZqV51lMRoEZEQH1jlHRhlon3nfTi7dnM="; + }; propagatedBuildInputs = [ bleach @@ -58,7 +41,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - inherit node; # For convenience + inherit nodejs; # For convenience }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/node/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/node/default.nix deleted file mode 100644 index 64326c6b21..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/node/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix deleted file mode 100644 index 21089c4d54..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix +++ /dev/null @@ -1,573 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=" \ ''; - patches = [ ./dependency-fixes.patch ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; + propagatedBuildInputs = [ + appdirs + consonance + protobuf + python-axolotl + six + ]; meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch deleted file mode 100644 index eab56332d4..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index e3871a7..930bd6a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,7 +5,7 @@ import yowsup - import platform - import sys - --deps = ['consonance==0.1.2', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0'] -+deps = ['consonance>=0.1', 'python-axolotl>=0.2', 'six>=1.10', 'appdirs', 'protobuf>=3.6.0'] - - if sys.version_info < (2, 7): - deps.append('importlib') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 218c2edd0a..fdee7ace49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; + hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix index 9f22cd1dfc..8ad26668bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; }; + patches = [ + ./fix-test-yaml.patch + ]; + propagatedBuildInputs = [ yacs ]; pythonImportsCheck = [ "zcs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch b/third_party/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch new file mode 100644 index 0000000000..a046f18082 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch @@ -0,0 +1,13 @@ +diff --git a/test/test_zcs.py b/test/test_zcs.py +index e4981d3..893999f 100644 +--- a/test/test_zcs.py ++++ b/test/test_zcs.py +@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase): + cfg = self.cfg.clone() + yamlp = pathjoin(tmpboxx(), "test.yaml") + cfg.dump(yamlp) +- cfg_dict = yaml.load(open(yamlp)) ++ cfg_dict = yaml.load(open(yamlp), yaml.Loader) + cfgd = CfgNode(cfg_dict) + self.assertTrue(str(cfg.dump()) == str(cfgd.dump())) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 319cd7cce0..b81ac4f1fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.3"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0="; + sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw="; }; propagatedBuildInputs = [ 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 1cb2780cc9..f91706b97d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "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 d8398ac402..56d2704fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.66"; + version = "0.0.67"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc"; + sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; }; 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 611660fc3e..822a041e5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; + sha256 = "sha256-FbLMFflaR2++BiP9j3ceHncTEL96AflUEqC2BbbkdRA="; }; disabled = pythonOlder "3.6"; 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 5430569727..171e838fa3 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 @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.34.0"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,13 +19,16 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; + sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY="; }; propagatedBuildInputs = [ aiohttp + pydantic ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix new file mode 100644 index 0000000000..bc23854d95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkg-config +, gobject-introspection +, pygobject3 +, gtk3 +, glib +}: + +buildPythonPackage rec { + pname = "gtkme"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4="; + }; + + nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ]; + buildInputs = [ pygobject3 glib ]; + propagatedBuildInputs = [ gtk3 ]; + + pythonImportsCheck = [ + "gtkme" + ]; + + meta = with lib; { + description = "Manages an Application with Gtk windows, forms, lists and other complex items easily"; + homepage = "https://gitlab.com/doctormo/gtkme"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + revol-xut + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix b/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix index 92f7e80951..4ec5b28bdd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/alloy/default.nix @@ -17,7 +17,7 @@ let generic = { version, sha256 }: desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; - categories = "Development;IDE;Education;"; + categories = [ "Development" "IDE" "Education" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix index 06fc4d2e90..6f6ef1ca8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -9,7 +9,7 @@ let pname = "amazon-qldb-shell"; - version = "2.0.0"; + version = "2.0.1"; package = rustPlatform.buildRustPackage { inherit pname version; @@ -17,13 +17,13 @@ let owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pnm1HxEjjNKpS3tTymtOXxUF7EEnWM+7WBsqeaG8seA="; + sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o="; }; nativeBuildInputs = [ clang cmake ]; buildInputs = [ llvmPackages.libclang ]; - cargoSha256 = "sha256-EUqGSKcGnhrdLn8ystaLkkR31RjEvjW6vRzKPMK77e8="; + cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -34,6 +34,7 @@ let homepage = "https://github.com/awslabs/amazon-qldb-shell"; license = licenses.asl20; maintainers = [ maintainers.terlar ]; + mainProgram = "qldb"; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix index a2c1e0a06c..602f6815fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.8"; + version = "1.6.9"; subPackages = [ "cmd/actionlint" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-wjLY40bxpoMk6YIG/4KbjxSWUDVNn3cX5OcsgfEPjzk="; + sha256 = "sha256-UDa/qFtRTED6d+lPbjNknX9qFZ3QZ9jiD0ByvLsGARk="; }; vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; 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 79efb55f08..0d634e3ec4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.875"; + version = "2.0.913"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-ZM554FZayuxxf9dgbGcvfPoXm5rWjjZoNySnKpxRO/w="; + hash = "sha256-gSWD3Y7yySJvWicL5zgCGvMWfk98mBdTXB+Xwo4fork="; }; nativeBuildInputs = with py.pkgs; [ @@ -106,11 +106,12 @@ buildPythonApplication rec { "TestSarifReport" # Will probably be fixed in one of the next releases "test_valid_cyclonedx_bom" - "test_record_relative_path_with_direct_oberlay" - "test_record_relative_path_with_direct_prod2_oberlay" + "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" - "test_record_relative_path_with_relative_dir" + # AssertionError: 0 not greater than 0 + "test_skip_mapping_default" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 8bf2ed7c04..a6a95e74e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.0"; + version = "2.8.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas="; + sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index da73737530..503d5c6304 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.42.0"; + version = "6.43.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; + sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; }; nativeBuildInputs = [ unzip makeWrapper ]; 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 1bef8cd075..d5d393ee96 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g="; + sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix b/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix index 3b9044a544..3dda078397 100644 --- a/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-91CjzSwflC8n9ff9XRfq2jva/wpmQ/SduEfoQlef3aU="; + sha256 = "sha256-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix index f6842dacec..9d873b8461 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.rustc wrapGAppsHook4 + rustPlatform.bindgenHook desktop-file-utils glib # for glib-compile-schemas ]; @@ -63,11 +64,6 @@ stdenv.mkDerivation rec { libshumate ]; - # libspa-sys requires this for bindgen - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # included by libspa-sys requires - BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index 60d8d8f58b..1b0ccab296 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.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jJaob2eaozMFRsXwW6ulgM5De3UmpLZddTHwq6PnaeE="; + sha256 = "sha256-8GwZsFvxaTtG/q7DaWvZcGdbyJ4Cm41BqSvwq3SqoEg="; }; - vendorSha256 = "sha256-wPnrkfv6pJB6tkZo2oeMbWHbF9njGh1ZEWu8tkHDhGo="; + vendorSha256 = "sha256-g3bvfNF0XkC12/tRZsO+o2z20w+riWiHOer8Pzp1QF0="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index dd3b2ae2bf..44e8b9e441 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; + sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c="; }; - vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao="; + vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 7dfb6c9b2a..80919cfc37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; + sha256 = "1sgnxw58srjxqnskl700p7r7n23pfpjvqpiqnz1m8r6c76jwnllr"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; + sha256 = "13f4n15i0gsk9jq52gxivnsk32qjahmxgrddm54cf8ynw0a923ia"; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index 37cb4dd866..3ec37b89fd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -81,7 +81,7 @@ let (rebar3WithPlugins { globalPlugins = [rebar3-nix]; }) ] } - latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix index 1fb4206d5c..cd058bfc26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-30218.patch"; + url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; + sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; + }) + (fetchpatch { + name = "CVE-2021-30219.patch"; + url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; + sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; + }) + ]; + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix index 8e8503227e..c045944b77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.1"; + version = "0.1.2"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-wULC0/n0ZFdBXOjxVe/VYsdsGBorNd51HczCK20Pmwc="; + sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q"; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-tXcg+FOm+Ig61/Jw9ibEp0sHeXI9tpt+ya3Z/yS7MCk="; + sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj"; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix index b8ad9c6d77..bcb115e409 100644 --- a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RCGJ7Xa5HLzcngv79NyocbNGoYZMAKyv/svRScM1vq0="; + sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0="; }; - vendorSha256 = "sha256-ZURtNED8gb0QsuXxJd9oBSx68ABcwlvVpkbd7lhiA9s="; + vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index bd9819f8a0..9a48ecb1f5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.02.09"; + version = "2022.03.04"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-WfPjn0S7Jd6zFcfaudcSsx9d5luyZuaeB8lFaOLg21w="; + sha256 = "sha256-x/mDyWYxWR5H894n+BCBaxgRLQLPgVCip59nOUbavpk="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix index 663e0a5b66..f50afcd466 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix @@ -26,6 +26,11 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' + ''; + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ pygls pyparsing ]; 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 67433ab5d8..7818f7464b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.287.1"; + version = "2.288.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo="; + hash = "sha256-bP+6aAKnu6PxN9eppFXsqOSVSGQ6Lv+gEF2MdEz52WE="; }; nativeBuildInputs = [ @@ -184,6 +184,11 @@ stdenv.mkDerivation rec { "EnsureDotnetsdkPowershellDownloadScriptUpToDate" ] ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix. + ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [ + "RunnerLayoutParts_CheckExternalsHash" + "RunnerLayoutParts_CheckDotnetRuntimeHash" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" 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 57e9d15dce..6dc0a7d30e 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,31 +1,54 @@ -{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: +{ lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.7.0"; + version = "14.8.2"; in -buildGoPackage rec { +buildGoModule rec { inherit version; pname = "gitlab-runner"; - goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; - subPackages = [ "." ]; - commonPackagePath = "${goPackagePath}/common"; + + commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; ldflags = [ "-X ${commonPackagePath}.NAME=gitlab-runner" "-X ${commonPackagePath}.VERSION=${version}" "-X ${commonPackagePath}.REVISION=v${version}" ]; + vendorSha256 = "1aa04hbavr0bclddp5adjwwj21sp46gbhjydxc3w7vs1siw0ivq2"; + src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl"; + sha256 = "1zwr09lrrc3xx3sp00vs30ks0n77d7v0xkz0mz9jy2qdls9nfmrv"; }; patches = [ ./fix-shell-path.patch ]; + prePatch = '' + # Remove some tests that can't work during a nix build + + # Requires to run in a git repo + sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go + sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + + # No writable developer environment + rm common/build_test.go + rm executors/custom/custom_test.go + + # No docker during build + rm executors/docker/terminal_test.go + rm executors/docker/docker_test.go + rm helpers/docker/auth/auth_test.go + ''; + + preCheck = '' + # Make the tests pass outside of GitLab CI + export CI=0 + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix index f137cbd078..6094df8757 100644 --- a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE="; + sha256 = "sha256-ys7fuaD1jj3tWD6U+BRvqFneZEdKV5c1RO2FLEtqIUk="; }; - cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo="; + cargoSha256 = "sha256-5/uF0aPNNNUruRF8euuEnGSJHsRehSZipa0677zc12c="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index 85f7e603bb..c7450f738a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.16"; + version = "2.1.0-M1"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw="; + sha256 = "sha256-JeqWzAkSSqhdbgkse1uSA3k4bupepWuvx6GUtBfodcg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index ec56d582e6..06f4c947b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-cHMsBkP5R7rxRZgzzKaHJrFq36xC9PBuzTzc1kHKc4U="; + sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index eee49d1c6f..48456166b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g="; + sha256 = "sha256-0m0RjIasEGB9QxZc7wKCMLnxHXkSlvCDA2QWa87mRRs="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw="; + cargoSha256 = "sha256-KNQa+wLLl4abz48QKYkWu7A+FTGIyB+1EWAnLuWpJwc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index ef95263185..da43a4daf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 0220e2d61f..e908849a3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "SQuirreL SQL"; genericName = "SQL Client"; - categories = "Development;"; + categories = [ "Development" ]; icon = "squirrel-sql"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index b50d348d7d..e94917f15d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "0.15.16"; + version = "0.15.22"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-FIFsx6iSirUY14cn6E7CPhZQKtcgnyZ2fYghrMUx3Lw="; + hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8="; }; - vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; + vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0"; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix index 91ce1bb087..fdec9ad19e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4="; + sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k="; }; vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 2b122326bf..8633362572 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -1,26 +1,24 @@ { lib +, argon2-cffi-bindings , buildPythonApplication -, fetchPypi -# buildInputs -, glibcLocales -, pkginfo , check-manifest -# propagatedBuildInputs -, py , devpi-common -, pluggy -, setuptools -# CheckInputs -, pytest -, pytest-flake8 -, webtest -, mock , devpi-server -, tox -, sphinx -, wheel +, fetchPypi , git +, glibcLocales , mercurial +, mock +, pkginfo +, pluggy +, py +, pytestCheckHook +, pytest-flake8 +, setuptools +, sphinx +, tox +, webtest +, wheel }: buildPythonApplication rec { @@ -29,24 +27,45 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec"; + hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; }; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; - - checkInputs = [ - pytest pytest-flake8 webtest mock - devpi-server tox - sphinx wheel git mercurial + buildInputs = [ + glibcLocales ]; - # --fast skips tests which try to start a devpi-server improperly - checkPhase = '' - HOME=$TMPDIR py.test --fast + propagatedBuildInputs = [ + argon2-cffi-bindings + check-manifest + devpi-common + pkginfo + pluggy + py + setuptools + ]; + + checkInputs = [ + devpi-server + git + mercurial + mock + pytestCheckHook + pytest-flake8 + sphinx + tox + webtest + wheel + ]; + + preCheck = '' + export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + # --fast skips tests which try to start a devpi-server improperly + "--fast" + ]; + LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; @@ -57,5 +76,4 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix index b647505fe4..d117d9319d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; + sha256 = "sha256-QC0WAM+qitee0dyJorl5Hio3COy4JiIHmFgBIj7S2yM="; }; - vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; + vendorSha256 = "sha256-9n/782uKu7qNV/WEpbEV3aHcPXipyOhGdAhT/F4O2xc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index 87e1ca0274..f2bd4bb1b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.22.0"; + version = "0.22.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sE5Ojm4ZkMNQ6ihaT5GGRjqqJ6gEvoMaliMbRSkS8wI="; + sha256 = "sha256-iYqQABXd3Vra+U7cfGKBEyTXfQGwHxFSxEoDyCfKk5Y="; }; - cargoSha256 = "sha256-KQLoF0yvlZaQIn50WlmlfHsIYjgca6odCnhmWG2au2U="; + cargoSha256 = "sha256-QMOS8Pn3RwZZRtKqp077ihh91Q4VPe8alrtQ6dYIXmA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index cd324ae387..e37801d272 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc="; + sha256 = "sha256-FZHz46GUPG5LgJcuKxheERWcctuHdDWgGPslEAu+j08="; }; - vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04="; + vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 01146542d0..7408b35fe5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { comment = "Eclipse Memory Analyzer"; desktopName = "Eclipse MAT"; genericName = "Java Memory Analyzer"; - categories = "Development;"; + categories = [ "Development" ]; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index df55b51a0a..655ad71e7b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -83,33 +83,33 @@ rec { headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8"; }; - electron_15 = mkElectron "15.3.7" { - armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6"; - aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750"; - x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc"; - i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5"; - x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a"; - aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752"; - headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7"; + electron_15 = mkElectron "15.4.0" { + armv7l-linux = "40c073a3b416f83264327bdf5e33b334ffcd56a729ef237360d66f520f670d16"; + aarch64-linux = "ef18ba74b4fa34a26f9ee819bb908c60d0dd9ec2048414629979760f262d72f8"; + x86_64-linux = "5bdea4cbf5559491e9ad9f365fa6f7ec26603fd6f68bfa8848f2884ebd51662d"; + i686-linux = "636d0e28bb20ca127c9b8722fe39e7e7d95fc63bd15b156b7af563296b3d9595"; + x86_64-darwin = "8a132b2be0f27c7e8fa9a91a8b4b0fcdf3ec571c721cb5f5610dc8a6b3f0fd26"; + aarch64-darwin = "82b29c37a427464a9278d617435ca19f472b00689c9e58163e99f30b90f33046"; + headers = "0fc1sck7g160klpqzfcqv9zc45ia914mrncyma58zzcbzpk6k6yb"; }; - electron_16 = mkElectron "16.0.9" { - armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594"; - aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d"; - x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4"; - i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2"; - x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40"; - aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879"; - headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5"; + electron_16 = mkElectron "16.0.10" { + armv7l-linux = "1a72fe59011cfcc1f376f2948dd5a70d2f75d6c12fb682a0246d2e596227b5e0"; + aarch64-linux = "46cd1393816364a666ead410505bce4b51d68ce872446a71d16886b88c4b275a"; + x86_64-linux = "3b4779e41e27200ce5fa94d20f9df05ff5c757be6805eb0e8952fe198d66f324"; + i686-linux = "9e1426a8135d3fe195ba9fc1a5ea5ad4d5ce96bd513691897b39106698e3c3c8"; + x86_64-darwin = "00b0222efa67fbb29f723fabebc4221646ebd6d5fdc09524df9a203f63ce660c"; + aarch64-darwin = "1203f6ec4e8b97312254ceb122ca4399f39ae67bfe1636e426a798c89ec2a9ee"; + headers = "10f6px88vg6napyhniczi6l660qs4l5mm0b9gdlds4i1y94s1zrl"; }; - electron_17 = mkElectron "17.0.1" { - armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00"; - aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4"; - x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf"; - i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9"; - x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17"; - aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca"; - headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8"; + electron_17 = mkElectron "17.1.0" { + armv7l-linux = "09d92195821aad4ac03fbc858287a7372b6aa059081bb825d267853ee1b0425d"; + aarch64-linux = "6a34d6802d44a391902f53baf0adc8b819d33e7c31b34614757b17b3223c9d1e"; + x86_64-linux = "106ec28a5969366c1e1f642cc33ac41950c68bd182db23b04d7ac6886bfe28e8"; + i686-linux = "19fe206be07a6df7f9f0ecdb411e3cafd3a53618edb19cc6adc77156f698444e"; + x86_64-darwin = "bd80d6b0b62c9bec195d264aa21a255f4324a8b56849e04972c1fcc262757c31"; + aarch64-darwin = "83fe2fc24976d09a0e0fcc3a60226f190cf9b67287fe4434d3d76d59fa45315c"; + headers = "1zv1pigfbis1bsan28wx3bgkdwjc48pjq19wmxs73kd1khsy6w8r"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix index ba30aa97e0..79470814ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ent-go"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "ent"; repo = "ent"; rev = "v${version}"; - sha256 = "sha256-TG08GRo1gNxC5iHt/Md5WVWaEQ1m2mUDGqpuxw8Pavg="; + sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY="; }; - vendorSha256 = "sha256-n5dS78SSBAEgE4/9jMZZhbOQZ3IGi9n3ErA0ioP9Tsg="; + vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA="; subPackages = [ "cmd/ent" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 82e69c2d91..d6903f464f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.23"; + version = "0.14.24"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-7J8l4PCXDSddlUdMYaTo3KQjhUl1IRpks0iMiYxJzD4="; + sha256 = "sha256-ayL5aTfYFdsmZ4Zpkij27HE/2MCyt6J5qQ1d0BIX0eE="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index f0e125245e..5cb92b3b83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.14"; + version = "3.14.15"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; + sha256 = "sha256-7840HndsU5+mWKQ/HXLVYA2dV7L8NlM7so1nk8Zdc2c="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix index fc44efca82..f3a5ab297e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-bindata"; - version = "3.22.0"; + version = "3.23.0"; goPackagePath = "github.com/kevinburke/go-bindata"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; + sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY="; }; subPackages = [ "go-bindata" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix index 967fbb625a..8c340b2ccf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.7.9-p1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-JzPCNUoO3biNJLYKLkyJvVG/L7pqWBthtBuZL+Lc21U="; + sha256 = "sha256-axvc3iwAfsKunheLLKmUThZh27axRh/GJRcKy9EfEBw="; }; vendorSha256 = "sha256-QphjiJSQRULphWjrJ8RzrUblTDYL/fYoSNT3+g0tP48="; 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 05ffe14dd4..d6e5855d99 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.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA="; + sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; }; - vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs="; + vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix index b807006369..2c39229649 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkflJwFdVcFTjXkDr8qqAFUlKwGNPTso6hvu7Vikn2U="; + sha256 = "sha256-S6IF/MtNCkhPHHdaQJyT78j2z4xdf4z/xLfXDmCWR2Y="; }; - vendorSha256 = "sha256-RZPfdj+rimKGvRZKaXOirkd7ietri55rBofwa/l2z8s="; + vendorSha256 = "sha256-LhiCxpjySEezhcgICfgD+mABd1QXyZn3uI1Fj+eWiyo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index ae813c0f6e..0f57be390f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM="; + sha256 = "sha256-VBan3IKqf3AFrPoryT/U7lGabFHSXMhaBpnNw3LRH/I="; }; modRoot = "gopls"; - vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; + vendorSha256 = "sha256-pW4G89fYFwVM2EkIqTCsl2lhN677LIMFpKPvLVV2boY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix index a7eb80366c..d9e19fdac9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.9.6"; + version = "2.10.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eDzLVoOPYm8WG07dfi6s+xtBliCwf1LXoHxQ10YWs1A="; + sha256 = "sha256-a3MDGsTqndHlT6fbUkdsBShDqWXOHQiJFUIjyMqvMq8="; }; - vendorSha256 = "sha256-ELfbdrMMeK6ZG+hnibhHNB+k/Zvkepl+cbUx+E/Dvr8="; + vendorSha256 = "sha256-3ZGzVGKwnNab8wUn0fRepl4FDo43MAqNAO3zijH90/0="; subPackages = [ "cmd/gosec" diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 7f89961f9f..ee72bc62ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Development;"; + categories = [ "Development" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix index 37d1cf7dc2..8c0d20d328 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jpexs/default.nix @@ -36,10 +36,8 @@ stdenv.mkDerivation rec { desktopName = "JPEXS Free Flash Decompiler"; genericName = "Flash Decompiler"; comment = meta.description; - categories = "Development;Java;"; - extraEntries = '' - StartupWMClass=com-jpexs-decompiler-flash-gui-Main - ''; + categories = [ "Development" "Java" ]; + startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 7af7e36b22..732175edab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mFTJJCoC5nxo5ugJdi+MmssV70yKrQQsH+a+K7hTyS8="; + sha256 = "sha256-CntAxOsAaKkCvQanLZ4d99VEGrbsVM+IYOhUuimvjlA="; }; - cargoSha256 = "sha256-aclfFy2tQL57EaIsg1e30JCF5nX2Cm/MaxeSPtR/Uas="; + cargoSha256 = "sha256-mzHLAmm0wvF35ku+wg6QG/pKwIFjb22fOtBmMhgC0Ik="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 59b61135fa..050b971af9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,29 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.11.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-9lC3vegfxEACoX25ebcLQU453IYy1zQf1K84YyLEnlU="; + sha256 = "sha256-ssc6djhSk0xV4jdlTmehWX6UMBPAuebtYlzWRZ/32mM="; }; - cargoSha256 = "sha256-cTAbAnSqvrc6e9NtbiV7caj1JnQReWMUhCQoFXZ7Nbs="; + cargoSha256 = "sha256-ynYK37nCfIiy1CHBEQ/vMHOAPY/pp/lF/tSl9MJD7fY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - postInstall = '' - installManPage man/just.1 - - installShellCompletion --cmd just \ - --bash completions/just.bash \ - --fish completions/just.fish \ - --zsh completions/just.zsh - ''; - checkInputs = [ coreutils bash ]; preCheck = '' @@ -49,10 +40,17 @@ rustPlatform.buildRustPackage rec { "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" "--skip=invoke_error_function" # wants JUST_CHOOSER to be fzf - "--skip=status_error" # "exit status" instead of "exit code" - "--skip=exit_status" # "exit status" instead of "exit code" ]; + postInstall = '' + installManPage man/just.1 + + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh + ''; + meta = with lib; { homepage = "https://github.com/casey/just"; changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/tools/mani/default.nix b/third_party/nixpkgs/pkgs/development/tools/mani/default.nix index 079e4bf6fe..aa047c2471 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mani/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mani/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mani"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-EkoDyVDK+DmwK45qBPwyHegQGsK9B5SQ0zVf1lBYbPE="; + sha256 = "sha256-sjudHGqSCgwafyT8alrGvTdC3yM2zmbRcYshxSm23Ko="; }; vendorSha256 = "sha256-NnXQAf8m2cGLvwSOzQWXffiG1zyVqDPQnGAeqe7EUHY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix b/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix index 97ffd564c4..fa98ab9da8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mars-mips/default.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { exec = "mars-mips"; icon = "mars-mips"; comment = "An IDE for programming in MIPS assembly language"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index 06a6bd3dfd..131c899dcf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.5.5"; + version = "2.6.1"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; + sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw="; }; meta = with lib; { 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 10e11391cd..aa38966b19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5.1"; + version = "4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; + sha256 = "sha256-h1lhR8P4aNM6tQCodhpEIXwA0bUQ26B3aoiQeX2siCU="; }; outputs = [ "out" "man" ]; 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 ef5b276ada..5184f22aec 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.16737"; + version = "0.1.16947"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2dgoREWGA+YpsESUmua5HcJu6Z/lEhzBdakx97xfLFk="; + sha256 = "sha256-RGkC1XhrssrX4IBh1OrzEowvbPPUK7jXZxxa+FEV/WE="; }; vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 4841c48d0e..6a372fb40f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.02.01-16.53.14"; + version = "2022.02.23-12.12.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; + sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; + sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index d746a6d1ff..c49fb15610 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -17,12 +17,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.15"; + version = "4.16"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; + sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52"; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 9460353873..64ee3da1ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20210331.tar.gz"; + name = "acpica-unix2-20211217.tar.gz"; archive = fetchurl { - sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz"; + sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; }; } { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh index d4c348a5d0..3acf22e2cd 100755 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -8,7 +8,7 @@ fi pkg_dir="$(dirname "$0")" -src="$(nix-build . --no-out-link -A coreboot-toolchain.src)" +src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" urls=$($src/util/crossgcc/buildgcc -u) tmp=$(mktemp) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix new file mode 100644 index 0000000000..45e1ba8e4b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix @@ -0,0 +1,38 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4McF9tLIjDCftyGI29pm/LnTUBVWG+pY5z+mGFKySQM="; + }; + + cargoSha256 = "sha256-/filuQ4AWsKVIsXbDX7S1yhCArLNTZpOMEn3ID6WuMo="; + + # tests do not find grcov path correctly + checkFlags = let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = with lib; { + description = + "Rust tool to collect and aggregate code coverage data for multiple source files"; + homepage = "https://github.com/mozilla/grcov"; + license = licenses.mpl20; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 1688e92c84..27ff31dae9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -9,6 +9,7 @@ rev = "9bce425c3304173548d8e822029644bb51d35263"; sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; + patches = [ ./eval.patch ]; nix = nixVersions.unstable; tests = { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch new file mode 100644 index 0000000000..a1b7599cc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch @@ -0,0 +1,34 @@ +--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc ++++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc +@@ -64,11 +64,11 @@ + + static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute) + { +- Strings res; ++ std::list res; + std::function rec; + + rec = [&](Value & v) { +- state.forceValue(v); ++ state.forceValue(v, noPos); + if (v.type() == nString) + res.push_back(v.string.s); + else if (v.isList()) +@@ -112,7 +112,7 @@ + callFlake(state, lockedFlake, *vFlake); + + auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value; +- state.forceValue(*vOutputs); ++ state.forceValue(*vOutputs, noPos); + + auto aHydraJobs = vOutputs->attrs->get(state.symbols.create("hydraJobs")); + if (!aHydraJobs) +@@ -191,7 +191,7 @@ + state.forceList(*a->value, *a->pos); + for (unsigned int n = 0; n < a->value->listSize(); ++n) { + auto v = a->value->listElems()[n]; +- state.forceValue(*v); ++ state.forceValue(*v, noPos); + if (v->type() == nString) + job["namedConstituents"].push_back(state.forceStringNoCtx(*v)); + } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix index 842cf0eb5b..7329ad5096 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix @@ -1,23 +1,17 @@ { lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: stdenv.mkDerivation rec { pname = "qtspim"; - version = "9.1.22"; + version = "9.1.23"; src = fetchsvn { url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + rev = "r749"; + sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp"; }; postPatch = '' cd QtSpim - # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim - sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp - sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp - sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp - sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp - substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index 4472cae205..242d76174c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -13,7 +13,7 @@ let comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; in appimageTools.wrapType2 { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix index 5943b57d80..487445e0fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix index 13b5291479..2e3075c7b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.27"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE="; + sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; }; - cargoSha256 = "sha256-xkRlUXlkXQwvzIuhExf+tSSBi+8BZv58btvln05UI+k="; + cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; meta = with lib; { description = "SystemVerilog language server"; 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 5f969721aa..8cf86d9d78 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o="; + sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI="; }; - cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q="; + cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA="; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index af10523e3b..3c191d7c6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.72.0"; + version = "0.74.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; + sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index e443ca7751..51ea630274 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20210411.0"; + version = "5.9.20220220.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr"; + sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { substituteInPlace Tmain/utils.sh \ --replace /bin/echo ${coreutils}/bin/echo + + # Remove git-related housekeeping from check phase + substituteInPlace makefiles/testing.mak \ + --replace "check: tmain units tlib man-test check-genfile" \ + "check: tmain units tlib man-test" ''; postConfigure = '' @@ -37,8 +42,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkFlags = [ "units" ]; - meta = with lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index 6de56fb470..00bcd3a5f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.3"; + version = "1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4="; + sha256 = "sha256-+uIP/U7H9P7oy78TL1edX9+JNYUzpwro105PYj3D6Yk="; }; buildInputs = [ zlib openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix index 1c3da92273..5c3153a884 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5"; }; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ ocaml ]; # build fails otherwise enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index e94e98d8f7..65debca11c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, perl }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "camlp5 is not available for OCaml ${ocaml.version}" else 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 831360cd85..2d030b2d15 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 @@ -57,11 +57,19 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + jq + ]; buildInputs = [ dot-merlin-reader yojson csexp result + menhirSdk + menhirLib ]; doCheck = true; @@ -71,12 +79,6 @@ buildDunePackage { dune runtest # filtering with -p disables tests runHook postCheck ''; - checkInputs = [ - jq - menhir - menhirLib - menhirSdk - ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 1c9b549d61..3db5d13778 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage, substituteAll -, dot-merlin-reader, dune_2, yojson, csexp, result }: +, dot-merlin-reader, dune_2, yojson, csexp, result, menhirSdk }: buildDunePackage rec { pname = "merlin"; @@ -22,7 +22,9 @@ buildDunePackage rec { }) ]; - buildInputs = [ dot-merlin-reader yojson csexp result ]; + strictDeps = true; + + buildInputs = [ dot-merlin-reader yojson csexp result menhirSdk ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index 10c7bf63aa..d35ddbe210 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ocamlmod ocamlify ]; + buildInputs = [ ocamlbuild ]; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index 0d92840a82..a37a8c8b39 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages, menhir }: ocamlPackages.buildDunePackage rec { pname = "obelisk"; @@ -11,7 +11,10 @@ ocamlPackages.buildDunePackage rec { sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; }; - buildInputs = with ocamlPackages; [ menhir re ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; + buildInputs = with ocamlPackages; [ re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5686e33f9b..517ca6585f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -28,8 +28,10 @@ let src = }."${version}"; }; ocamlPackages = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.19.0" then ocaml-ng.ocamlPackages + else if lib.versionAtLeast version "0.17.0" + then ocaml-ng.ocamlPackages_4_12 else if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages_4_10 else ocaml-ng.ocamlPackages_4_07 @@ -48,6 +50,12 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + ]; + buildInputs = if lib.versionAtLeast version "0.20.0" then [ @@ -57,7 +65,6 @@ buildDunePackage { either fix fpath - menhir menhirLib menhirSdk ocaml-version @@ -78,7 +85,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ocp-indent @@ -96,7 +102,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -115,7 +120,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -135,7 +139,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk (ppxlib.override { version = "0.18.0"; }) @@ -154,7 +157,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ] else [ diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 716e2679a9..1ca8cfb5c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -13,7 +13,10 @@ buildDunePackage rec { sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7"; }; - buildInputs = [ cppo cmdliner re ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 913871314c..42baa97b83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib -, lambdaTerm, cppo, makeWrapper, buildDunePackage +, lambda-term, cppo, makeWrapper, buildDunePackage }: if !lib.versionAtLeast ocaml.version "4.03" @@ -17,10 +17,9 @@ buildDunePackage rec { sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cppo ]; + nativeBuildInputs = [ makeWrapper cppo ]; - propagatedBuildInputs = [ lambdaTerm ]; + propagatedBuildInputs = [ lambda-term ]; postFixup = let diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 7fd1fff89d..1099e7cc80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ tesq0 ericdallo corngood ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index cc18a6af22..0cad568642 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zgiJDmpjmm2rzi12XAT+bHpiOKwi1k6xd9fvPGwFNXQ="; + sha256 = "sha256-TamtjFnh+HT7JHcRTEpALdkXM9MyZGulb644bNr/BQI="; }; - vendorSha256 = "sha256-kilFwOSIToURJFqfa1/PtdUA21ieJzL9vgsXbYNbht0="; + vendorSha256 = "sha256-uci8/gQqLtjmxxqSlpgZhgBnvMotMvklNfwR+ua8H3M="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/packet/default.nix b/third_party/nixpkgs/pkgs/development/tools/packet/default.nix index 723e5d8bb2..61e9b21068 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packet/default.nix @@ -1,25 +1,25 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; - src = fetchgit { - rev = version; - url = "https://github.com/ebsarr/packet"; - sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; + src = fetchFromGitHub { + owner = "ebsarr"; + repo = "packet"; + rev = "v${version}"; + sha256 = "sha256-jm9u+LQE48aqO6CLdLZAw38woH1phYnEYpEsRbNwyKI="; }; goDeps = ./deps.nix; - meta = { + meta = with lib; { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix index d4a6f1c409..507284081f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig"; + sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; }; buildInputs = [ libusb1 pico-sdk ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix index f0b66467c6..82a31ea52b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-F21eli4HdLw3RComvocwBrcGfruIjO23E6+7a4+6vbs="; + sha256 = "1ay59pmprcswip6zzbqfy5g2rdv4lgmps8vrxay4l9w6xn9lg03v"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index ea842c8208..ee03e043dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 782996d921..444db11732 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -34,7 +34,9 @@ let touch $out ''; }; - } '' + } + # if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook + '' mkdir -p $out/bin export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index b2a0c3fad4..860d537170 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,17 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-6Wm/qnrSUswWnXt6CPUJUvqNj06eSYuYOmGhbpO1hvo="; + sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; }; - cargoSha256 = "sha256-1+3NMfUhL5sPu92r+B0DRmJ03ZREkFZHjMjvabLyFgs="; + cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 7fc1da095e..eede871e38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-sN0i2oo0XuxneIK/w+jpxkcdm2rtqhyH2Y3CMPnH+ro="; + sha256 = "sha256-ooFkw6QlMnlvyHPMkqAZUDaOHH8dktzbob5WevQsYXQ="; }; - cargoSha256 = "sha256-Gv7C4NFThNawhT+IYO0ZbpOh6w/yPeIJKZjzTyM/GJw="; + cargoSha256 = "sha256-MgtFNrSjSvyjp1uD/OueSh+MCYSvZCyDabP20pI/8HI="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 24d309eb68..29dc1202d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.8"; + version = "0.35.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA="; + sha256 = "sha256-yjApyM3UM4gLUPpbVMv+7hpF5VGXS8W9RUnlsJd/Sbo="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc="; + cargoSha256 = "sha256-YGpQXz35dPUeY8YlZ4Ul/utpNgEgW90xHiT+I+jOJIo="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ecbf9b34..caac565e62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rKkU49sqVArp/iCfcG78ieoEbyZoqB1owTwLfl09DSM="; + sha256 = "sha256-OBcRN0tYNnNqytmmAm6DMtHtp+JzPjomfTpeQEtQE84="; }; - cargoSha256 = "sha256-aA4l7kyVnu416LcHddJqrEpi8WS0AImbROZG+kBy5tk="; + cargoSha256 = "sha256-uZw/ojPAzbpRYb2pkJ/i/+GXvxxU6piCLuMG/fPII2M="; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix index 47d58e9b92..f2099a855c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix @@ -1,7 +1,8 @@ { lib , rustPlatform , fetchFromGitHub -, nix-update-script +, genericUpdater +, common-updater-scripts , makeWrapper , rr }: @@ -20,8 +21,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa"; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index b4e0364d08..c8021a7444 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7QTlbZZcWZx/E2jYYu0A6kBbScmCml0wpJ17tqLYg90="; + sha256 = "sha256-nxcrllAoS/1e5hFURtrB9e6zyHnot90PFAuyVCsO4lY="; }; - cargoSha256 = "sha256-E9AouGvZTg3wD/loc80Cz933oEnWMSqwQEYTU+NPtjM="; + cargoSha256 = "sha256-AV3fgKloQ/9UEWjYRI4gENSqilhFlpbUrXhXREytcWc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix index 97f3d4d4b3..ac54657c8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "sha256-yKmm24X+5P5UATjWn0LJqby9lKRhwlvDK5suTPxKGwU="; + sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE="; }; - cargoSha256 = "sha256-8n2WryAWi/bIL0XCSlNYcxXN2ld1tis435ScuU0QcBs="; + cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk="; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix new file mode 100644 index 0000000000..aabb8b94c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, runCommand +, fetchCrate +, rustPlatform +, Security +, openssl +, pkg-config +, SystemConfiguration +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "duckscript_cli"; + version = "0.8.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-cMvcCX8ViCcUFMuxAPo3/wxXvg5swAcBrLx1x7lSwvM="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + + cargoSha256 = "sha256-8ywMLXFmdq119K/hl1hpsVhzG+nrdO4eux3lAqUjB+A="; + + meta = with lib; { + description = "Simple, extendable and embeddable scripting language."; + homepage = "https://github.com/sagiegurari/duckscript"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 53e74bf163..2221ae0a14 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-01-31"; - cargoSha256 = "sha256-BWCLzyCcLWwmh7Os7NjN2o89KD+VB0EHyZfTyYoYM08="; + version = "2022-02-28"; + cargoSha256 = "sha256-dTw6xp99uGtGp6YuqAX3r3GDD6Wto3KHTaO2DUUE2FA="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk="; + sha256 = "sha256-GQ1cPO4povnozLl0MTFs0ZXpmBn+AZeFWQVnxHHWf9g="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index e86380c53e..005c5cfc47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-OBIuURj0C/ws71KTGN9EbMwN4QsGMEdgoWyctmHaHjQ="; + sha256 = "sha256-Tz7YzGkQUwH0U14dvsttP2GpnM9kign6L9PkAVs3dEc="; }; - cargoSha256 = "sha256-9+I4mi7w1WK2NkmN65EtC52KtSZR9GjrHCPE9w82IXw="; + cargoSha256 = "sha256-EKuRaVxwotgTPj95GJnrQGbulsFPClSettwS5f0TzoM="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix index ee49ee1bf6..6a442424c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.4.0"; + version = "3.4.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "l5F09bjRev2eBHKTMzojC7+USkW7qf3YtA2KSoN7MxM="; + outputHash = "FWGvhKK/VnvetnHS35/z1errYTRZCrcfWyEAHlhKApk="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix index 438555998f..77928a1f22 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix @@ -64,13 +64,13 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix index 6dd3e11b60..1322cfc751 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenic-view/default.nix @@ -66,8 +66,8 @@ let desktopName = pname; exec = pname; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { 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 8087148c16..2d20beb2eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.72.2"; + version = "1.73.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-iaU0+sbssHhenz7QgXI9n5J2P5b0Tbw7fdvekRmjEeY="; + sha256 = "sha256-wnpC/LVhGOXWaa198bcahjdXRVuh1Xv0tFe2BCfOnNE="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-vz0qSKFoM5kRgATshQ8W+yJTtWyQRvHp22t4nsJHqG0="; + cargoSha256 = "sha256-7mjAKuiFcNzjt8Ti5/50TmPy3LY6dwXuQCHtbcoVZm8="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 7db111a50f..1b25634502 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -1,30 +1,26 @@ { fetchFromGitHub , lib , rustPlatform -, stdenvNoCC , lua52Support ? true , luauSupport ? false }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bgfG1cPhauU85FG/ZX1n2KqfydMeh92q347UsREkOGo="; + sha256 = "sha256-BPLN7/LaVDtCOJBgIJVbnENUyFtacRsK3JxDupytzOA="; }; - cargoSha256 = "sha256-njZTD6O67v787Z1tJ7G0QzxJLhqU2sfpOVw6r4woE9s="; + cargoSha256 = "sha256-MZsFbFQp5Rw20pXzvTFNhMiVx/TJZ63/2rU7vj7IcqQ="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; - # test_standard fails on darwin - doCheck = !stdenvNoCC.isDarwin; - meta = with lib; { description = "An opinionated Lua code formatter"; homepage = "https://github.com/johnnymorganz/stylua"; diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 1e182b888c..d87ecddbf8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.3.4"; - vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; + version = "5.4.1"; + vendorSha256 = "sha256-MlsgII1QybyW+B7DGbSyn7VQ36n29yOC0pZnaemEHO8="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-6k1yMGW/UYCFB1APGlcU8bjNcCD7/IXhG+RJR6ii56I="; + sha256 = "sha256-92Pth+IrILWkcP4mm3IcSN4+zs7TNg4CPGT2liop7/I="; }; # Tests requires network access diff --git a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix index 58fef12cd6..8f8d03db95 100644 --- a/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d..9ee452b26f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,19 +27,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ --add-flags "-f $dir/wp-cli" diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 087658fe55..81d4a36a86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -174,7 +174,7 @@ in rec { let package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; + packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages; globElemToRegex = lib.replaceStrings ["*"] [".*"]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index 483523e180..bfe18fc475 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.20.2"; + version = "4.21.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE="; + sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU="; }; - vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; + vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index c05737d1c8..fa2fe98f76 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FLT4O542Q3qFjrsIsF9O/dgQQNAWhsZq+MaLqF8lLPA="; + sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; }; - cargoSha256 = "sha256-mKmMgAoEavv5kb2fo+X5dfpw0ftAho6aU3/wCTgwXao="; + cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 5fac42ab7b..7de71132d6 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.297"; + version = "0.0.301"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Ug/dGHj3prgmiIr6tkEYveTwGPUI0ivy6UtuU5QoJ2U="; + sha256 = "sha256-UwouKnUfEcYpwtLXxwe93mHzVvj/+72FSQ0OW55oztE="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-EwMPPZOZ0xE1DKvaU7+PrUH+Ty6ut3UYJZSY4EqXFWo="; + vendorSha256 = "sha256-VKX/Wt7CQy3w4Zv51M/IF1RIPpn7nTCL1T6jJ+oxti4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index a45d06cb4c..bf1ed98b47 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix b/third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix index 3b885e6515..a6ef66d069 100644 --- a/third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/protege-distribution/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { desktopName = "Protege Desktop"; icon = "protege"; comment = "OWL2 ontology editor"; - categories = "Development"; + categories = [ "Development" ]; exec = "run-protege"; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/90secondportraits/default.nix b/third_party/nixpkgs/pkgs/games/90secondportraits/default.nix index 07458cc644..1cf7829cfc 100644 --- a/third_party/nixpkgs/pkgs/games/90secondportraits/default.nix +++ b/third_party/nixpkgs/pkgs/games/90secondportraits/default.nix @@ -16,7 +16,7 @@ let comment = "A silly speed painting game"; desktopName = "90 Second Portraits"; genericName = "90secondportraits"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/third_party/nixpkgs/pkgs/games/abuse/default.nix b/third_party/nixpkgs/pkgs/games/abuse/default.nix index 2e863022a6..1e2d4f82f8 100644 --- a/third_party/nixpkgs/pkgs/games/abuse/default.nix +++ b/third_party/nixpkgs/pkgs/games/abuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "abuse"; desktopName = "Abuse"; comment = "Side-scroller action game that pits you against ruthless alien killers"; - categories = "Game;ActionGame;"; + categories = [ "Game" "ActionGame" ]; }) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/alephone/default.nix b/third_party/nixpkgs/pkgs/games/alephone/default.nix index aa76cc17b4..98b21865d7 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/default.nix @@ -72,7 +72,7 @@ in self // { name = desktopName; exec = pname; genericName = pname; - categories = "Game;"; + categories = [ "Game" ]; comment = meta.description; inherit desktopName icon; }; diff --git a/third_party/nixpkgs/pkgs/games/angband/default.nix b/third_party/nixpkgs/pkgs/games/angband/default.nix index ed18624deb..3f706b42c3 100644 --- a/third_party/nixpkgs/pkgs/games/angband/default.nix +++ b/third_party/nixpkgs/pkgs/games/angband/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8="; + sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix index 640ea81c6c..1013be2694 100644 --- a/third_party/nixpkgs/pkgs/games/assaultcube/default.nix +++ b/third_party/nixpkgs/pkgs/games/assaultcube/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { desktopName = "AssaultCube"; comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; genericName = "First-person shooter"; - categories = "Game;ActionGame;Shooter"; + categories = [ "Game" "ActionGame" "Shooter" ]; icon = "assaultcube.png"; exec = pname; }; diff --git a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix index 43b274a128..b15abdbc47 100644 --- a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix +++ b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix @@ -25,11 +25,10 @@ in stdenv.mkDerivation rec { (makeDesktopItem { name = "Ballerburg"; desktopName = "Ballerburg SDL"; - type = "Application"; exec = "_NET_WM_ICON=ballerburg ballerburg"; comment = meta.description; icon = "ballerburg"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/blackshades/default.nix b/third_party/nixpkgs/pkgs/games/blackshades/default.nix index 76f22e98d9..bd21fc0807 100644 --- a/third_party/nixpkgs/pkgs/games/blackshades/default.nix +++ b/third_party/nixpkgs/pkgs/games/blackshades/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "blackshades"; - version = "2.4.7"; + version = "2.4.9"; src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8="; + sha256 = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; }; nativeBuildInputs = [ zig ]; diff --git a/third_party/nixpkgs/pkgs/games/blockattack/default.nix b/third_party/nixpkgs/pkgs/games/blockattack/default.nix index 7616d2e51a..6deba7987a 100644 --- a/third_party/nixpkgs/pkgs/games/blockattack/default.nix +++ b/third_party/nixpkgs/pkgs/games/blockattack/default.nix @@ -15,14 +15,13 @@ stdenv.mkDerivation rec { pname = "blockattack"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "blockattack"; repo = "blockattack-game"; rev = "v${version}"; - hash = "sha256-ySLm3AdoJRiMRdla45OJh8ZIFYNh+HzjG2VnFqoWuZA="; + hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/brogue/default.nix b/third_party/nixpkgs/pkgs/games/brogue/default.nix index 77811e76e9..d4f1f8faee 100644 --- a/third_party/nixpkgs/pkgs/games/brogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/brogue/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { comment = "Brave the Dungeons of Doom!"; icon = "brogue"; exec = "brogue"; - categories = "Game;AdventureGame;"; - terminal = "false"; + categories = [ "Game" "AdventureGame" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix index ccba8e23d5..1701d84e8d 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/common.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation { ); dontStrip = debug; + enableParallelBuilding = true; passthru = { isTiles = tiles; diff --git a/third_party/nixpkgs/pkgs/games/clonehero/fhs-wrapper.nix b/third_party/nixpkgs/pkgs/games/clonehero/fhs-wrapper.nix index 97758b2c1f..cd7f3986b1 100644 --- a/third_party/nixpkgs/pkgs/games/clonehero/fhs-wrapper.nix +++ b/third_party/nixpkgs/pkgs/games/clonehero/fhs-wrapper.nix @@ -13,7 +13,7 @@ let comment = clonehero-unwrapped.meta.description; exec = name; icon = name; - categories = "Game;"; + categories = [ "Game" ]; }; in buildFHSUserEnv { diff --git a/third_party/nixpkgs/pkgs/games/dhewm3/default.nix b/third_party/nixpkgs/pkgs/games/dhewm3/default.nix index a87236c48f..da75f3fd5d 100644 --- a/third_party/nixpkgs/pkgs/games/dhewm3/default.nix +++ b/third_party/nixpkgs/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "dhewm3"; exec = "dhewm3"; desktopName = "Doom 3"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/domination/default.nix b/third_party/nixpkgs/pkgs/games/domination/default.nix index 0dde8ab164..b7eae5e5ac 100644 --- a/third_party/nixpkgs/pkgs/games/domination/default.nix +++ b/third_party/nixpkgs/pkgs/games/domination/default.nix @@ -11,15 +11,13 @@ let desktopItem = makeDesktopItem { - type = "Application"; - name = "Domination"; + name = "domination"; desktopName = "Domination"; exec = "domination"; icon = "domination"; }; editorDesktopItem = makeDesktopItem { - type = "Application"; - name = "Domination Map Editor"; + name = "domination-map-editor"; desktopName = "Domination Map Editor"; exec = "domination-map-editor"; icon = "domination"; diff --git a/third_party/nixpkgs/pkgs/games/duckmarines/default.nix b/third_party/nixpkgs/pkgs/games/duckmarines/default.nix index af34742b9f..a4e37081ab 100644 --- a/third_party/nixpkgs/pkgs/games/duckmarines/default.nix +++ b/third_party/nixpkgs/pkgs/games/duckmarines/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = "Duck-themed action puzzle video game"; desktopName = "Duck Marines"; genericName = "duckmarines"; - categories = "Game;"; + categories = [ "Game" ]; }; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix index 251b51df43..f8ca3b40f5 100644 --- a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix +++ b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { exec = "ecwolf"; comment = "Enhanced Wolfenstein 3D port"; desktopName = "Wolfenstein 3D"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix index c349223496..4eb46e0ac1 100644 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix @@ -11,7 +11,7 @@ let comment = "Duke Nukem 3D port"; desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; - categories = "Game;"; + categories = [ "Game" ]; }; wrapper = "eduke32-wrapper"; diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix index 74702a9733..4cf335a613 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix @@ -53,8 +53,7 @@ let comment = "A game in which you build and maintain factories."; exec = "factorio"; icon = "factorio"; - type = "Application"; - categories = "Game"; + categories = [ "Game" ]; }; branch = if experimental then "experimental" else "stable"; diff --git a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix index 5ddad7fda4..e610f2427a 100644 --- a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix +++ b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "fish-fillets-ng"; desktopName = "Fish Fillets"; comment = "Puzzle game about witty fish saving the world sokoban-style"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix index 6f4a57587d..af79a6d4b2 100644 --- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix +++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { comment = "FlightGear Flight Simulator"; desktopName = "FlightGear"; genericName = "Flight simulator"; - categories = "Game;Simulation"; + categories = [ "Game" "Simulation" ]; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/games/freedroid/default.nix b/third_party/nixpkgs/pkgs/games/freedroid/default.nix index 266407d17d..38eb60e7e0 100644 --- a/third_party/nixpkgs/pkgs/games/freedroid/default.nix +++ b/third_party/nixpkgs/pkgs/games/freedroid/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Freedroid Classic"; comment = "A clone of the classic game 'Paradroid' on Commodore 64"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/freenukum/default.nix b/third_party/nixpkgs/pkgs/games/freenukum/default.nix index ff1e887223..0d2f833671 100644 --- a/third_party/nixpkgs/pkgs/games/freenukum/default.nix +++ b/third_party/nixpkgs/pkgs/games/freenukum/default.nix @@ -16,12 +16,9 @@ let name = pname; exec = pname; icon = pname; - terminal = "false"; comment = description; - type = "Application"; - categories = "Game;ArcadeGame;ActionGame"; + categories = [ "Game" "ArcadeGame" "ActionGame" ]; genericName = pname; - fileValidation = false; }; in diff --git a/third_party/nixpkgs/pkgs/games/frogatto/default.nix b/third_party/nixpkgs/pkgs/games/frogatto/default.nix index 0b53e3d0be..f987992858 100644 --- a/third_party/nixpkgs/pkgs/games/frogatto/default.nix +++ b/third_party/nixpkgs/pkgs/games/frogatto/default.nix @@ -7,12 +7,12 @@ let desktopItem = makeDesktopItem { name = "frogatto"; exec = "frogatto"; - startupNotify = "true"; + startupNotify = true; icon = "${data}/share/frogatto/modules/frogatto/images/os/frogatto-icon.png"; comment = description; desktopName = "Frogatto"; genericName = "frogatto"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }; version = "unstable-2020-12-04"; in buildEnv { diff --git a/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix b/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix index f9dd3fd615..6738f979d0 100644 --- a/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix +++ b/third_party/nixpkgs/pkgs/games/frozen-bubble/default.nix @@ -25,7 +25,7 @@ perlPackages.buildPerlModule { desktopName = "Frozen Bubble"; genericName = "Frozen Bubble"; comment = "Arcade/reflex colour matching game"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/gnujump/default.nix b/third_party/nixpkgs/pkgs/games/gnujump/default.nix index 6f91b10345..1c918395d4 100644 --- a/third_party/nixpkgs/pkgs/games/gnujump/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnujump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { icon = "gnujump"; desktopName = "GNUjump"; comment = "Jump up the tower to survive"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix index e38294ff40..a10b370e64 100644 --- a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix @@ -60,7 +60,7 @@ let name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index bcbe2a6c65..c0416d0dd7 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -2,11 +2,11 @@ let pname = "heroic"; - version = "2.0.2"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage"; - sha256 = "sha256-4gq0ZCcPIx/CkFNZTM5Atkd/GP6v1t3MO2tibrKkcZQ="; + sha256 = "sha256-zzxf3eM1fUWTVtzzABcwlmptNuCVQafvotnbOiCzu0c="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index 08427bd292..0397bb474d 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "hyperrogue"; exec = "hyperrogue"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/itch/default.nix b/third_party/nixpkgs/pkgs/games/itch/default.nix index a8cfe8f24d..34a2775c3c 100644 --- a/third_party/nixpkgs/pkgs/games/itch/default.nix +++ b/third_party/nixpkgs/pkgs/games/itch/default.nix @@ -24,14 +24,12 @@ stdenvNoCC.mkDerivation rec{ (makeDesktopItem { name = pname; exec = pname; + tryExec = "itch %U"; icon = pname; desktopName = pname; - mimeType = "x-scheme-handler/itchio;x-scheme-handler/itch"; + mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; comment = "Install and play itch.io games easily"; - extraDesktopEntries = { - TryExec = "itch %U"; - Categories = "Game;"; - }; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/ivan/default.nix b/third_party/nixpkgs/pkgs/games/ivan/default.nix index ce0eeea738..53e1b3cf00 100644 --- a/third_party/nixpkgs/pkgs/games/ivan/default.nix +++ b/third_party/nixpkgs/pkgs/games/ivan/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { icon = "ivan.png"; desktopName = "IVAN"; genericName = pname; - categories = "Game;AdventureGame;RolePlaying;"; + categories = [ "Game" "AdventureGame" "RolePlaying" ]; comment = meta.description; }; diff --git a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix index 93f17dbb81..0c40d537fc 100644 --- a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -11,17 +11,19 @@ , rhash , tinyxml-2 , help2man +, testVersion +, lgogdownloader }: stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; + sha256 = "sha256-Qt9uTKsD0kQ6b9Y5+eC+YWpCHMIJGzP+pMfuUBt/fME="; }; nativeBuildInputs = [ @@ -40,15 +42,9 @@ stdenv.mkDerivation rec { tinyxml-2 ]; - doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${pname}" --version)" == "LGOGDownloader ${version}" ]]; then - echo '${pname} smoke check passed' - else - echo '${pname} smoke check failed' - return 1 - fi - ''; + passthru.tests = { + version = testVersion { package = lgogdownloader; }; + }; meta = with lib; { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; diff --git a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix b/third_party/nixpkgs/pkgs/games/lunar-client/default.nix index 2dc0e14daf..fbebe85cf0 100644 --- a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix +++ b/third_party/nixpkgs/pkgs/games/lunar-client/default.nix @@ -5,13 +5,13 @@ let version = "2.9.3"; desktopItem = makeDesktopItem { - name = "Lunar Client"; + name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; - categories = "Game;"; + categories = [ "Game" ]; }; appimageContents = appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/default.nix b/third_party/nixpkgs/pkgs/games/maelstrom/default.nix index 5f78e34eda..065784d605 100644 --- a/third_party/nixpkgs/pkgs/games/maelstrom/default.nix +++ b/third_party/nixpkgs/pkgs/games/maelstrom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { desktopName = "Maelstrom"; genericName = "Maelstrom"; comment = "An arcade-style game resembling Asteroids"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/mari0/default.nix b/third_party/nixpkgs/pkgs/games/mari0/default.nix index 55ef9f51d5..8189c07898 100644 --- a/third_party/nixpkgs/pkgs/games/mari0/default.nix +++ b/third_party/nixpkgs/pkgs/games/mari0/default.nix @@ -10,7 +10,7 @@ let comment = "Crossover between Super Mario Bros. and Portal"; desktopName = "mari0"; genericName = "mari0"; - categories = "Game"; + categories = [ "Game" ]; }; in diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index d28f2b1d1e..82df3710c5 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -66,7 +66,6 @@ let ''; desktopItem = makeDesktopItem { - type = "Application"; name = "Mindustry"; desktopName = "Mindustry"; exec = "mindustry"; diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json index ba0b652a6b..af1b032bd7 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.18": { - "url": "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar", - "sha1": "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9", - "version": "1.18.1", + "url": "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar", + "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469", + "version": "1.18.2", "javaVersion": 17 }, "1.17": { diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index 254c01fdf1..08104310fa 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -38,7 +38,7 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;"; + categories = [ "Game" ]; }; envLibPath = lib.makeLibraryPath [ diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index 9e94bb6a4a..e607fbc711 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -3,6 +3,7 @@ , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex , leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp , OpenGL, OpenAL ? openal, Carbon, Cocoa +, Kernel }: with lib; @@ -20,7 +21,8 @@ let sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; outputs = [ "out" "dev" ]; meta = irrlicht.meta; }; diff --git a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix b/third_party/nixpkgs/pkgs/games/mrrescue/default.nix index 2328c20ef9..a873424aa2 100644 --- a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix +++ b/third_party/nixpkgs/pkgs/games/mrrescue/default.nix @@ -16,7 +16,7 @@ let comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix index 881935279f..57fbad3405 100644 --- a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix +++ b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { desktopName = "oh-my-git"; comment = "An interactive Git learning game!"; genericName = "An interactive Git learning game!"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/openjk/default.nix b/third_party/nixpkgs/pkgs/games/openjk/default.nix index c16b38fc8f..d2844809ee 100644 --- a/third_party/nixpkgs/pkgs/games/openjk/default.nix +++ b/third_party/nixpkgs/pkgs/games/openjk/default.nix @@ -8,7 +8,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Multi Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; jasp = makeDesktopItem rec { name = "jasp"; @@ -17,7 +17,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Single Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { pname = "OpenJK"; diff --git a/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix b/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix index 44fc219bef..d3f8155f54 100644 --- a/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix +++ b/third_party/nixpkgs/pkgs/games/opensupaplex/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { icon = "open-supaplex"; desktopName = "OpenSupaplex"; comment = meta.description; - categories = "Application;Game;"; + categories = [ "Application" "Game" ]; })]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/orthorobot/default.nix b/third_party/nixpkgs/pkgs/games/orthorobot/default.nix index c168af81ad..34808438da 100644 --- a/third_party/nixpkgs/pkgs/games/orthorobot/default.nix +++ b/third_party/nixpkgs/pkgs/games/orthorobot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { comment = "Robot game"; desktopName = "Orthorobot"; genericName = "orthorobot"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 5ddbabe042..2b1a2f044f 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -63,7 +63,7 @@ buildDotnetModule rec { icon = "osu!"; comment = meta.description; type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; })]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix index ec5ae3e7d1..137b86f57b 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { name = "quakespasm"; exec = "quake"; desktopName = "Quakespasm"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/randtype/default.nix b/third_party/nixpkgs/pkgs/games/randtype/default.nix index 0eaf2c0921..97993a5ffd 100644 --- a/third_party/nixpkgs/pkgs/games/randtype/default.nix +++ b/third_party/nixpkgs/pkgs/games/randtype/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dandellion ]; license = licenses.gpl2Only; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix b/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix index fd570e4d7c..b01d616452 100644 --- a/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix +++ b/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Rocks'n'Diamonds"; genericName = "Tile-based puzzle"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net ]; diff --git a/third_party/nixpkgs/pkgs/games/rott/default.nix b/third_party/nixpkgs/pkgs/games/rott/default.nix index cac357faf2..b3a517dab0 100644 --- a/third_party/nixpkgs/pkgs/games/rott/default.nix +++ b/third_party/nixpkgs/pkgs/games/rott/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { name = "rott"; exec = "launch-rott"; desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/games/runelite/default.nix index 9a2ce6314c..d342d543e2 100644 --- a/third_party/nixpkgs/pkgs/games/runelite/default.nix +++ b/third_party/nixpkgs/pkgs/games/runelite/default.nix @@ -31,10 +31,9 @@ stdenv.mkDerivation rec { exec = "runelite"; icon = icon; comment = "Open source Old School RuneScape client"; - terminal = "false"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; - categories = "Game"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix index 7373779c9e..1d2e39d416 100644 --- a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix +++ b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { icon = "sauerbraten"; desktopName = "Sauerbraten"; comment = "FPS that uses an improved version of the Cube engine"; - categories = "Application;Game;ActionGame;"; + categories = [ "Application" "Game" "ActionGame" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix index e6fb00eb76..4711ffa2f5 100644 --- a/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix @@ -68,7 +68,7 @@ tcl.mkTclDerivation rec { comment = meta.description; icon = "scid"; exec = "scid"; - categories = "Game;BoardGame;"; + categories = [ "Game" "BoardGame" ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/scummvm/games.nix b/third_party/nixpkgs/pkgs/games/scummvm/games.nix index 2ffd176ccf..b146bf1bc4 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/games.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/games.nix @@ -3,7 +3,7 @@ let desktopItem = name: short: long: description: makeDesktopItem { - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; comment = description; desktopName = long; exec = "@out@/bin/${short}"; diff --git a/third_party/nixpkgs/pkgs/games/sdlpop/default.nix b/third_party/nixpkgs/pkgs/games/sdlpop/default.nix index f9b91e3dc1..f9f2f6d0dc 100644 --- a/third_party/nixpkgs/pkgs/games/sdlpop/default.nix +++ b/third_party/nixpkgs/pkgs/games/sdlpop/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { exec = "prince"; desktopName = "SDLPoP"; comment = "An open-source port of Prince of Persia"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/sienna/default.nix b/third_party/nixpkgs/pkgs/games/sienna/default.nix index 59f01f6a2c..37138f152b 100644 --- a/third_party/nixpkgs/pkgs/games/sienna/default.nix +++ b/third_party/nixpkgs/pkgs/games/sienna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/starsector/default.nix b/third_party/nixpkgs/pkgs/games/starsector/default.nix index 4aac0afb22..95fb3988f2 100644 --- a/third_party/nixpkgs/pkgs/games/starsector/default.nix +++ b/third_party/nixpkgs/pkgs/games/starsector/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { comment = meta.description; genericName = "starsector"; desktopName = "Starsector"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/steam-tui/default.nix b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix index 66e17b1752..63deb3b969 100644 --- a/third_party/nixpkgs/pkgs/games/steam-tui/default.nix +++ b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix @@ -2,7 +2,7 @@ , rustPlatform , steamcmd , fetchFromGitHub -, steam-run-native +, steam-run , runtimeShell , withWine ? false , wine @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; - buildInputs = [ steamcmd steam-run-native ] + buildInputs = [ steamcmd ] ++ lib.optional withWine wine; preFixup = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cat > $out/bin/steam-tui < 2.0, >= 2.0.3) + json_pure (~> 2.3, >= 2.3.1) + thor (~> 1.0, >= 1.0.1) + +PLATFORMS + ruby + +DEPENDENCIES + vimgolf + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/games/vimgolf/default.nix b/third_party/nixpkgs/pkgs/games/vimgolf/default.nix new file mode 100644 index 0000000000..2847ff7dd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/vimgolf/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vimgolf"; + gemdir = ./.; + exes = [ "vimgolf" ]; + + passthru.updateScript = bundlerUpdateScript "vimgolf"; + + meta = with lib; { + description = "A game that tests Vim efficiency"; + homepage = "https://vimgolf.com"; + license = licenses.mit; + maintainers = with maintainers; [ leungbk ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/vimgolf/gemset.nix b/third_party/nixpkgs/pkgs/games/vimgolf/gemset.nix new file mode 100644 index 0000000000..17d66b934b --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/vimgolf/gemset.nix @@ -0,0 +1,43 @@ +{ + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + json_pure = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ddn30jkpw6anfakfm7lffnrl2i0265ryrrwa4j0ivihjr95y82"; + type = "gem"; + }; + version = "2.6.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + vimgolf = { + dependencies = ["highline" "json_pure" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190dzqkvshd4i6jf30xnpm4sczraw6rdh4wvfh6qnmg0czmj0sny"; + type = "gem"; + }; + version = "0.5.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 8c2e857317..a14e80759b 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { exec = "vintagestory"; icon = "vintagestory"; comment = "Innovate and explore in a sandbox world"; - type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index 788fbdbf6c..e4a2ff4c31 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg="; + sha256 = "sha256-sdHc/i1ffbTAY7ehO6LsIa+ll+LHkuXIwcwTIEOY28g="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix index fee4699aec..00a8af6d8b 100644 --- a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix +++ b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix @@ -8,11 +8,10 @@ let desktopItem = makeDesktopItem { desktopName = "World of Goo"; genericName = "World of Goo"; - categories = "Game;"; + categories = [ "Game" ]; exec = "WorldOfGoo.bin.${arch}"; icon = "2dboy-worldofgoo"; name = "worldofgoo"; - type = "Application"; }; in diff --git a/third_party/nixpkgs/pkgs/games/xbill/default.nix b/third_party/nixpkgs/pkgs/games/xbill/default.nix index a20b52e785..765af44936 100644 --- a/third_party/nixpkgs/pkgs/games/xbill/default.nix +++ b/third_party/nixpkgs/pkgs/games/xbill/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { icon = "xbill"; desktopName = "XBill"; comment = "Get rid of those Wingdows viruses!"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/xonotic/default.nix b/third_party/nixpkgs/pkgs/games/xonotic/default.nix index d5374c5446..46b0b594d7 100644 --- a/third_party/nixpkgs/pkgs/games/xonotic/default.nix +++ b/third_party/nixpkgs/pkgs/games/xonotic/default.nix @@ -50,9 +50,9 @@ let exec = "xonotic"; comment = meta.description; desktopName = "Xonotic"; - categories = "Game;Shooter;"; + categories = [ "Game" "Shooter" ]; icon = "xonotic"; - startupNotify = "false"; + startupNotify = false; }; xonotic-unwrapped = stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/misc/cups/filters.nix b/third_party/nixpkgs/pkgs/misc/cups/filters.nix index a20e3b71b0..fdf4f163ba 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/filters.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/filters.nix @@ -1,28 +1,62 @@ -{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi -, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript -, mupdf, dejavu_fonts, liblouis +{ lib +, avahi +, bc +, coreutils +, cups +, dbus +, dejavu_fonts +, fetchurl +, fontconfig +, gawk +, ghostscript +, gnugrep +, gnused +, ijs +, libjpeg +, liblouis +, libpng +, makeWrapper +, mupdf +, perl +, pkg-config +, poppler +, poppler_utils +, qpdf +, stdenv +, which +, withAvahi ? true }: let - binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; + binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.11"; + version = "1.28.12"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "sha256-KYbLSNE0Db5XnELAjCqINYem2+WUNuQi9BhMzQqWZm0="; + sha256 = "sha256-RuLqPYhK0iK7hjzmUR5ZzzkO+Og1KVvkSoDlALKjOjo="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus avahi ghostscript mupdf + cups + dbus + fontconfig + ghostscript + ijs + libjpeg liblouis # braille embosser support - ]; + libpng + mupdf + perl + poppler + poppler_utils + qpdf + ] ++ lib.optionals withAvahi [ avahi ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" @@ -37,7 +71,7 @@ in stdenv.mkDerivation rec { "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ]; + ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix index 72c342e7b6..f81e81ecbe 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, sconsPackages +, scons , libX11 , pkg-config , libusb1 @@ -22,10 +22,18 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; + enableParallelBuilding = true; dontUseSconsInstall = true; + patches = [ + ./fix-60-sec-delay.patch + ./scons-py3.patch + ./scons-v4.2.0.patch + ./xboxdrvctl-py3.patch + ]; + meta = with lib; { homepage = "https://xboxdrv.gitlab.io/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch new file mode 100644 index 0000000000..da543d2cfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch @@ -0,0 +1,27 @@ +From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001 +From: buxit +Date: Wed, 2 Nov 2016 16:25:14 +0100 +Subject: [PATCH] fix 60 seconds delay + +use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()` +should fix #144 +--- + src/usb_gsource.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp +index 00bf1315..afb38f65 100644 +--- a/src/usb_gsource.cpp ++++ b/src/usb_gsource.cpp +@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u + gboolean + USBGSource::on_source() + { +- libusb_handle_events(NULL); ++ struct timeval to; ++ to.tv_sec = 0; ++ to.tv_usec = 0; ++ libusb_handle_events_timeout_completed(NULL, &to, NULL); + return TRUE; + } + diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch new file mode 100644 index 0000000000..4aa6fa6193 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-py3.patch @@ -0,0 +1,63 @@ +From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001 +From: xnick +Date: Thu, 12 Oct 2017 20:34:35 +0300 +Subject: [PATCH] Update SConstruct + +python3 compatible +--- + SConstruct | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4cd79704..c0007054 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env): + xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);", + r"union { \1 fn; void* obj; } conv;\n " + "conv.obj = (marshal_data ? marshal_data : cc->callback);\n " +- "callback = conv.fn;", xml) ++ "callback = conv.fn;", xml.decode('utf-8')) + + with open(target[0].get_path(), "w") as f: + f.write(xml) +@@ -29,10 +29,10 @@ def build_bin2h(target, source, env): + Takes a list of files and converts them into a C source that can be included + """ + def c_escape(str): +- return str.translate(string.maketrans("/.-", "___")) ++ return str.translate(bytes.maketrans(b"/.-", b"___")) + +- print target +- print source ++ print(target) ++ print(source) + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +@@ -45,8 +45,8 @@ def build_bin2h(target, source, env): + data = fin.read() + fout.write("// \"%s\"\n" % src.get_path()) + fout.write("const char %s[] = {" % c_escape(src.get_path())) +- bytes_arr = ["0x%02x" % ord(c) for c in data] +- for i in xrange(len(bytes_arr)): ++ bytes_arr = ["0x%02x" % c for c in data] ++ for i in range(len(bytes_arr)): + if i % 13 == 0: + fout.write("\n ") + fout.write(bytes_arr[i]) +@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version }) + conf = Configure(env) + + if not conf.env['CXX']: +- print "g++ must be installed!" ++ print('g++ must be installed!') + Exit(1) + + # X11 checks + if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'): +- print 'libx11-dev must be installed!' ++ print('libx11-dev must be installed!') + Exit(1) + + env = conf.Finish() diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch new file mode 100644 index 0000000000..04b05e8d6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch @@ -0,0 +1,20 @@ +--- a/SConstruct 2021-10-31 20:42:44.232084185 -0400 ++++ b/SConstruct 2021-10-31 20:42:54.063024444 -0400 +@@ -36,7 +36,7 @@ + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"]) + + # write down data +@@ -62,7 +62,7 @@ + for src in source], ",\n")) + fout.write("\n}\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"]) + + fout.write("/* EOF */\n") diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch new file mode 100644 index 0000000000..71d8762cb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch @@ -0,0 +1,73 @@ +--- a/xboxdrvctl 2021-06-21 19:39:51.000000000 -0400 ++++ b/xboxdrvctl 19:43:27.467984928 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python3 + + ## Xbox360 USB Gamepad Userspace Driver + ## Copyright (C) 2011 Ingo Ruhnke +@@ -37,23 +37,23 @@ + help="print controller status") + + group.add_option("-s", "--slot", metavar="SLOT", type="int", +- dest="slot", ++ dest="slot", + help="use slot SLOT for actions") + + group.add_option("-l", "--led", metavar="NUM", type="int", +- dest="led", ++ dest="led", + help="set LED") + +-group.add_option("-r", "--rumble", metavar="L:R", +- dest="rumble", ++group.add_option("-r", "--rumble", metavar="L:R", ++ dest="rumble", + help="print controller status") + + group.add_option("-c", "--config", metavar="NUM", type="int", +- dest="config", ++ dest="config", + help="switches to controller configuration NUM") + + group.add_option("--shutdown", action="store_true", +- dest="shutdown", ++ dest="shutdown", + help="shuts down the daemon") + + parser.add_option_group(group) +@@ -69,9 +69,9 @@ + try: + bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') + except dbus.exceptions.DBusException: +- bus = dbus.SystemBus() ++ bus = dbus.SystemBus() + else: +- print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'" ++ print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'") + exit() + + if options.status: +@@ -82,19 +82,19 @@ + daemon.Shutdown() + else: + if (options.led or options.rumble or options.config) and options.slot == None: +- print "Error: --slot argument required" ++ print("Error: --slot argument required") + exit() + else: + if options.slot != None: + slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot) +- ++ + if options.led != None: + slot.SetLed(options.led) + + if options.rumble: + m = re.match('^(\d+):(\d+)$', options.rumble) + if not m: +- print "Error: invalid argument to --rumble" ++ print("Error: invalid argument to --rumble") + exit() + else: + left = int(m.group(1)) diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index b75f9c3f80..9527c156e4 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.1"; + version = "2.22.2"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; + sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index ef1d7b1401..75caa3fcfb 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkg-config +, installShellFiles , platform-tools , ffmpeg @@ -10,10 +11,10 @@ }: let - version = "1.22"; + version = "1.23"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-wF0nPux1M8DhBiguAlTPBOf16PDCkgyjlEiGX6sqQZs="; + sha256 = "sha256-KpE/1HR4wLMG/KUHywvrYl5JoZ/5/Hq5BONu9bn+fmg="; }; in stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bYLvrCw6NNCZqgLWIEObnytgD74cE9pm/Z7dgB8S5x0="; + sha256 = "sha256-WR70wV+EfNFFkMFkffnwaTridd33CpJ0zTAlXYyjZgM="; }; # postPatch: @@ -36,11 +37,9 @@ stdenv.mkDerivation rec { --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" ''; - nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; + nativeBuildInputs = [ makeWrapper meson ninja pkg-config installShellFiles ]; - buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ - libusb1 - ]; + buildInputs = [ ffmpeg SDL2 libusb1 ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix index d25a777e65..b5e9ba8d2b 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/physlock/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { - version = "v13"; + version = "13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index 5c30040f49..941943a495 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.02"; + version = "6.03"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xm1ssJAzrVYs/m1Gv5MS5EUfeUa+2KRnGqk0TfkZMYQ="; + sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index e287066ddb..5d7a344088 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -395,12 +395,28 @@ in { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi4_32bit = buildUBoot { diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix new file mode 100644 index 0000000000..d937ce8fd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/dockutil/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dockutil"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "kcrawford"; + repo = "dockutil"; + rev = version; + sha256 = "sha256-8tDkueCTCtvxc7owp3K9Tsrn4hL79CM04zBNv7AcHgA="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 scripts/dockutil -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool for managing dock items"; + homepage = "https://github.com/kcrawford/dockutil"; + license = licenses.asl20; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix index 243bc657c9..ba8bc605e8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "MoltenVK"; - version = "1.1.7"; + version = "1.1.8"; buildInputs = [ AppKit @@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"; + rev = "90d4bd05cd77ef5782a6779a0fe3d084440dc80d"; hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE="; }; })).override { @@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation rec { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${version}"; - hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw="; + hash = "sha256-IfTBtA2fM7YN4qaSDUTfsiCXzn+omSV6oroL1ivKiVA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix index 21a69a2234..b0d1967d10 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20211210"; + version = "20220224"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-4CmJVwDeGm+DNgJSgEiSzVi1TR9f869Et7tq/kEOX0Q="; + sha256 = "sha256-ShneKhGK7kT4Vs0b7PpaGSV0tZV3lTcqhuN9yiTaH50="; }; # For pod2man during the build process. 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 27f32c6481..a9bd508d16 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" "--disable-ssh-token" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "--enable-static-cryptsetup" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix new file mode 100644 index 0000000000..7db444bff0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, kernel +}: + +stdenv.mkDerivation rec { + pname = "dddvb"; + version = "0.9.38-pre.4"; + + src = fetchFromGitHub { + owner = "DigitalDevices"; + repo = "dddvb"; + rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; + sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + }; + + postPatch = '' + sed -i '/depmod/d' Makefile + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + INSTALL_MOD_PATH = placeholder "out"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/DigitalDevices/dddvb"; + description = "ddbridge linux driver"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 69cd829049..02b549dd9e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,7 +7,7 @@ flutter.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = "sha256-QgeRCFbd3AcFekJunFTwu2nDOQpAOMJUxZhgY4stJJc="; + vendorHash = "sha256-L8am4vTx4KlMHUdIhrUsCxGc27vkolawS/9DyFCPOJQ="; src = fetchFromGitHub { owner = "canonical"; @@ -20,7 +20,7 @@ flutter.mkFlutterApp { meta = with lib; { description = "Firmware Updater for Linux"; homepage = "https://github.com/canonical/firmware-updater"; - license = licenses.free; + license = licenses.gpl3Only; maintainers = with maintainers; [ mkg20001 ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index ba8df75151..4ade35845e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2021-06-28"; + version = "2021-11-02"; srcs = [ (fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "00de3194a96397c913786945ac0af1fd6fbec45b"; - sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r"; + rev = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8"; + sha256 = "4WTrs/tUyOugufRrrh0qsEmhPclQD64ypYysxsnOyS8="; }) ]; @@ -32,7 +32,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/firmware/brcm" # Wifi firmware - for filename in firmware-nonfree/brcm/brcmfmac434??-sdio.*; do + shopt -s extglob + for filename in firmware-nonfree/brcm/brcmfmac434??{,s}-sdio.*; do cp "$filename" "$out/lib/firmware/brcm" done @@ -43,7 +44,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby"; + outputHash = "l+7VOq7CV5QA8/FWjMBGDcxq8Qe7NFf6E2Y42htZEgE="; meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 9934f51487..7143d0b55a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; - version = "2021-07-05"; + version = "2021-11-01"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "tools"; - rev = "2e59fc67d465510179155973d2b959e50a440e47"; - sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy"; + rev = "13474ee775d0c5ec8a7da4fb0a9fa84187abfc87"; + sha256 = "s/RPMIpQSznoQfchAP9gpO7I2uuTsOV0Ep4vVz7i2o4="; }; NIX_CFLAGS_COMPILE = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 29c1859121..7f0eef05dc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchurl, unzip }: stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20210805"; + version = "1.20220118"; - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "firmware"; - rev = version; - sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1"; + src = fetchurl { + url = "https://github.com/raspberrypi/firmware/archive/${version}.zip"; + sha256 = "sha256-98rbwKIuB7vb4MWbFCr7TYsvJB0HzPdH8Tw0+bktK/M="; }; + nativeBuildInputs = [ unzip ]; + installPhase = '' - mkdir -p $out/share/raspberrypi/boot - cp -R boot/* $out/share/raspberrypi/boot + mkdir -p $out/share/raspberrypi/ + mv boot "$out/share/raspberrypi/" ''; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix new file mode 100644 index 0000000000..0375eb0eea --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchurl, cabextract }: + +stdenv.mkDerivation rec { + pname = "xow_dongle-firmware"; + version = "2017-07"; + + dontUnpack = true; + dontInstall = true; + + src = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; + }; + + nativeBuildInputs = [ cabextract ]; + + buildPhase = '' + cabextract -F FW_ACC_00U.bin ${src} + mkdir -p $out/lib/firmware + cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin + ''; + + meta = with lib; { + description = "Xbox One wireless dongle firmware"; + homepage = "https://www.xbox.com/en-NZ/accessories/adapters/wireless-adapter-windows"; + license = licenses.unfree; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index 226c6e1c72..e967dea1c3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "0gi91vm0ai4vjzj6cfnjsfy8kbfxjiq2n7jnbhf5470qbx49qixr"; + hash = "sha256-kkcZuX8tB7N8l9O3X6H92EqEqdAcqSbX+pwr7GrcRFY="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - vendorSha256 = "1gw3q2pn8v6n9wkl5881rbxglislnr98a9gjqnqm894gnz7hfdzb"; + vendorSha256 = "sha256-6zcHz7ePJFSxxfIlhVK2VEf6+soBoUInT9ZsZK/Ag78="; doCheck = false; @@ -27,11 +27,15 @@ buildGoModule rec { buildInputs = [ pam ]; buildPhase = '' + runHook preBuild make + runHook postBuild ''; installPhase = '' + runHook preInstall make install + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/jool/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/jool/default.nix index 58894de6c2..2fd10778e2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/jool/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/jool/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix index 0517c50d4a..87e36fe5a9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "09avkiazpfxzrgr3av58jbina5x9jqvqhjkn39475pfhfhrlv9fv"; + sha256 = "08z23mi6xkr6zzp0hzh1cppvl2y0177s0lnpxqbpy8jiii5fxw8f"; }; } 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 9668faafc5..cdb6099d4a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.264-hardened1.patch", - "sha256": "1zlsww0mqaw5cswwqjvc9magh2a31v6ii7a4ivdra6nsv1xrdimy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.264-hardened1/linux-hardened-4.14.264-hardened1.patch" + "name": "linux-hardened-4.14.269-hardened1.patch", + "sha256": "1hj3yn70aifprcfz4k088pj0lbr92cl5y840g08p0cqz3f3jvf24", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.269-hardened1/linux-hardened-4.14.269-hardened1.patch" }, - "sha256": "1d1588f0zrq93dk9j8gmvfm9mlniyw98s0i3gmg2sa7h1p04pc2m", - "version": "4.14.264" + "sha256": "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3", + "version": "4.14.269" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.227-hardened1.patch", - "sha256": "127l8s1wb71iyb4iw1bxkxn48qcchz50qwjpx9r2vm81cihasxs7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.227-hardened1/linux-hardened-4.19.227-hardened1.patch" + "name": "linux-hardened-4.19.232-hardened1.patch", + "sha256": "195gbiial5rpiak4mszw3kn1dmm38npk2bchyb9lfvk1f26h2ybc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.232-hardened1/linux-hardened-4.19.232-hardened1.patch" }, - "sha256": "0d1jyyxdrpyi35033fjg8g6zz99ffry2ks1wlldfaxfa6wh9dp39", - "version": "4.19.227" + "sha256": "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg", + "version": "4.19.232" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.98-hardened1.patch", - "sha256": "13cjr3k2vyxmwk5gjrkwklzvl38p1d4qrzfqm7nqssvh52kqzkq1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.98-hardened1/linux-hardened-5.10.98-hardened1.patch" + "name": "linux-hardened-5.10.103-hardened1.patch", + "sha256": "0i70cya9llz6nnhf4d5zz3f8xhj21si8capymmzcjczz0378argj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.103-hardened1/linux-hardened-5.10.103-hardened1.patch" }, - "sha256": "0hwl1ypllx9l5pv04yavz627qb31ki9mhznsak5bq48hbz0wc90v", - "version": "5.10.98" + "sha256": "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g", + "version": "5.10.103" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.21-hardened1.patch", - "sha256": "1j01mlyr53wry8n7bzg6pi4nilj3i9jpq5aml6f25fjckz5apll7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.21-hardened1/linux-hardened-5.15.21-hardened1.patch" + "name": "linux-hardened-5.15.26-hardened1.patch", + "sha256": "14pdmiqnn06by8mvxw4gklqfrnngrimyz1ag76pr60iz6ka6y5g8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.26-hardened1/linux-hardened-5.15.26-hardened1.patch" }, - "sha256": "1lgvf3mrsbwjdjfvznbf5c3np76a7xxqr2rw7i6196ywsxnfnki9", - "version": "5.15.21" + "sha256": "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq", + "version": "5.15.26" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.177-hardened1.patch", - "sha256": "1xyfc1hsphjgaxr2b36y7r3mzm3vn8vd1av73cwr42flc0qn3g4j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.177-hardened1/linux-hardened-5.4.177-hardened1.patch" + "name": "linux-hardened-5.4.182-hardened1.patch", + "sha256": "0hcxy2hn836mivydmrbqrpvm4bfdsgf9xpx0iyz92rhd91ipgcyq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.182-hardened1/linux-hardened-5.4.182-hardened1.patch" }, - "sha256": "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq", - "version": "5.4.177" + "sha256": "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj", + "version": "5.4.182" } } 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 093e820563..85b5532db8 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.267"; + version = "4.14.269"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c"; + sha256 = "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3"; }; } // (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 1ba37f697f..0d3aabde31 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.230"; + version = "4.19.232"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p"; + sha256 = "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0b67c3cd5f..920128b904 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.302"; + version = "4.9.304"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0difn0vjz4hz9vl5lklawqy19ccb5gz5p5r1cyckschf0l2nyifm"; + sha256 = "099bkypbkb8an8jsl49f83kg6ic1yw9ssfc1qksaji1jparlnpi9"; }; } // (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 97416dd91e..f5fb414481 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.101"; + version = "5.10.103"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87"; + sha256 = "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g"; }; } // (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 e3a8505d98..472b1f58d3 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 @@ -1,9 +1,9 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "5.15.24"; + version = "5.15.26"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -11,8 +11,10 @@ buildLinux (args // rec { # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; + extraMeta.broken = stdenv.isi686; + src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl"; + sha256 = "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix index 5630b05d4f..e7c755d682 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.10"; + version = "5.16.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "17i3j07hgljsiz2kymbskp35p2xp14gb0mdi5s2r61c0h406yk8c"; + sha256 = "1wnpn5w0rfniy60m2a25wjm3flvpzvs2z1s4ga01b9qhbbqisnmv"; }; } // (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 64252a7156..b99c51e8e0 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.180"; + version = "5.4.182"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n"; + sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj"; }; } // (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 b647f6c4e1..1657798080 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 = "18587"; - sha256 = "01h3mvj36b3wnkjm932ya5prsyfw7fszifdb9bvqwrd2ggawxng9"; + rev = "18613"; + sha256 = "1qgvhrh4nnn56aykaxqmlnzy8s111b5vn277n7qm4ldyr312g4hs"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index 17d24c187d..99b966ac5c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,9 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.10.52"; - tag = "1.20210805"; + modDirVersion = "5.10.92"; + tag = "1.20220118"; + rev = "650082a559a570d6c9d2739ecc62843d6f951059"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,8 +13,8 @@ lib.overrideDerivation (buildLinux (args // { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = tag; - sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b"; + inherit rev; + sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME="; }; defconfig = { @@ -75,6 +76,7 @@ lib.overrideDerivation (buildLinux (args // { '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux"]) '' copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) '' + copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index c8d42ddda7..70be0e58eb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.78-rt55"; # updated by ./update-rt.sh + version = "5.10.100-rt62"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; + sha256 = "16892wnfkdpqy3v4xmdzlqn5zlfrgz9wqh6vadnx58xnr6pnasfm"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; + sha256 = "1wimp4ckaqp5cfvkf50gv3s5biyr0sjifz4faw23m07ciydm15k0"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh index ccb0179334..a9e0577fae 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-rt.sh @@ -38,6 +38,7 @@ latest-rt-version() { curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | grep -v '\-rc' | + sort --version-sort | tail -n 1 } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 4002657ad6..3964538a40 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnugrep, findutils }: +{ lib, stdenv, fetchurl }: let version = "28-1ubuntu4"; # impish 2021-06-24 @@ -26,8 +26,8 @@ in stdenv.mkDerivation { --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ - --replace " grep " " ${gnugrep}/bin/grep " \ - --replace " xargs " " ${findutils}/bin/xargs " + --replace " grep " " /run/booted-system/sw/bin/grep " \ + --replace " xargs " " /run/booted-system/sw/bin/xargs " ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix index 1278e25987..7ec8ac35e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.5.0"; + version = "1.5.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-ysdsuJ9MvmNY0/XSV+aO7Gh8buWed25DQhBE/5HIASU="; + sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI="; }; # Don't build and install html documentation diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix index f3f1a39397..972a71d503 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ lib +, stdenv +, fetchgit +, pkg-config +, libtraceevent +, asciidoc +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, coreutils +, which +, valgrind +, sourceHighlight +}: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.2.5"; + version = "1.3.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb"; + sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc="; }; - # Don't build and install html documentation postPatch = '' - sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile + substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd + patchShebangs check-manpages.sh ''; - outputs = [ "out" "dev" "devman" ]; + outputs = [ "out" "dev" "devman" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ]; buildInputs = [ libtraceevent ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix index f88cdcda52..d880e6a60e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix @@ -14,12 +14,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; - buildPhase = '' - runHook preBuild - + postPatch = '' substituteInPlace lsiutil.c \ --replace /sbin/modprobe "${kmod}/bin/modprobe" \ --replace /bin/mknod "${coreutils}/bin/mknod" + ''; + + buildPhase = '' + runHook preBuild + gcc -Wall -O lsiutil.c -o lsiutil runHook postBuild diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index 24ab34c4ea..75eb5d8757 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -90,7 +90,7 @@ installPhase() { fi # nvidia currently only supports x86_64 and i686 - if [ "$system" = "i686-linux" ]; then + if [ "$i" == "$lib32" ]; then install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json else install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix index 380d76844c..ba93b068fd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.16.2"; + version = "2.17.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-A6xMMpmzjlbAtNTCejKclYsAOgjztUigo8qLmU8tSTQ="; + sha256 = "sha256-4Dv6t8qC2Bp9OjbeTzkKO1IQ4/OWV2cfkih3zU6m3HM="; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix index 1ed47ba53c..35199d3357 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }: stdenv.mkDerivation rec { pname = "pam_p11"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pam openssl libp11 ]; + buildInputs = [ pam openssl libp11 ] + ++ lib.optionals stdenv.isDarwin [ libintl ]; meta = with lib; { homepage = "https://github.com/OpenSC/pam_p11"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 7fb5b092ca..5e956f3baf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.13.23"; + version = "0.15.25"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "08d2ri9g6lky3ixd5h0scm95hgc52lcjr3vcnmpdxn780q9ygmkm"; + sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 32378e451e..c68d405839 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,18 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2021.04.29-138a1"; + version = "2021.12.02"; + # From 3fdf703f3f7bbe57eacceada3b558031229a34b0 Mon Sep 17 00:00:00 2001 + # From: Peter Harper + # Date: Mon, 13 Dec 2021 11:56:11 +0000 + # Subject: [PATCH] 2021-12-02: Promote the 2021-12-02 beta release to LATEST/STABLE + commit = "3fdf703f3f7bbe57eacceada3b558031229a34b0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "v${version}"; - sha256 = "sha256-nzAMPa4gqCAcROFa7z34IoMA3aoMHX9fYCsPFde9dac="; + rev = commit; + sha256 = "sha256-JTL2ziOkT0tnOrOS08ttNtxj3qegsacP73xZBVur7xM="; }; buildInputs = [ python3 ]; @@ -26,7 +31,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/rpi-eeprom - cp rpi-eeprom-config rpi-eeprom-update $out/bin + cp rpi-eeprom-config rpi-eeprom-update rpi-eeprom-digest $out/bin cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom cp -P firmware/default firmware/latest $out/share/rpi-eeprom ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix index 310dac3933..31d8f50a52 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2021-11-04"; + version = "${kernel.version}-unstable-2022-02-22"; src = fetchFromGitHub { owner = "morrownr"; - repo = "88x2bu"; - rev = "745d134080b74b92389ffe59c03dcfd6658f8655"; - sha256 = "0f1hsfdw3ar78kqzr4hi04kpp5wnx0hd29f9rm698k0drxaw1g44"; + repo = "88x2bu-20210702"; + rev = "6a5b7f005c071ffa179b6183ee034c98ed30db80"; + sha256 = "sha256-BqTyJpICW3D4EfHHoN5svasteJnunu2Uz449u/CmNE0="; }; hardeningDisable = [ "pic" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/morrownr/88x2bu"; + homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix index cdc2425ae4..3013df7e29 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg="; + sha256 = "sha256-RoKRqqIVY9zjyXzGxHo+J4OV7cKc7CkqsdbpreB7EHc="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index ad012b0e06..a339c60e8d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "2.9.6"; + version = "2.9.7"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-rI6zD54NoArQbSJOINu9hifj/DJehCcqBpGI0TeoDLA="; + sha256 = "sha256-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg="; }; # Don't build and install html documentation diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index d2f17c6666..51ae7b002f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -1,8 +1,13 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , pkg-config +, rsync , libxslt +, meson +, ninja +, python3 +, gtk-doc , docbook_xsl , udev , libgudev @@ -15,23 +20,31 @@ , libimobiledevice }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.13"; + version = "0.99.15"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz"; - sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "upower"; + repo = "upower"; + rev = "v${version}"; + sha256 = "sha256-GlLy2MPip21KOabdW8Vw6NVe3xhzsd9htxQ2xO/hZ/4="; }; nativeBuildInputs = [ + meson + ninja + python3 + gtk-doc docbook_xsl gettext gobject-introspection libxslt pkg-config + rsync ]; buildInputs = [ @@ -39,29 +52,50 @@ stdenv.mkDerivation { libusb1 udev systemd - ] - ++ lib.optional useIMobileDevice libimobiledevice - ; + ] ++ lib.optionals useIMobileDevice [ + libimobiledevice + ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ + mesonFlags = [ "--localstatedir=/var" - "--with-backend=linux" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "--with-systemdutildir=${placeholder "out"}/lib/systemd" - "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" "--sysconfdir=/etc" + "-Dos_backend=linux" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" - installFlags = [ - "historydir=$(TMPDIR)/foo" - "sysconfdir=${placeholder "out"}/etc" - ]; + postPatch = '' + patchShebangs src/linux/unittest_inspector.py + ''; + + postInstall = '' + # Move stuff from DESTDIR to proper location. + # We use rsync to merge the directories. + for dir in etc var; do + rsync --archive "${DESTDIR}/$dir" "$out" + rm --recursive "${DESTDIR}/$dir" + done + for o in out dev; do + rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" + rm --recursive "${DESTDIR}/''${!o}" + done + # Ensure the DESTDIR is removed. + rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + ''; + + # HACK: We want to install configuration files to $out/etc + # but upower should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "${placeholder "out"}/dest"; meta = with lib; { homepage = "https://upower.freedesktop.org/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index 7d4563baee..de4517872f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -24,14 +24,14 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - sha256 = "sha256-CPuBQmDOpXWn0jPo4HRyDCZUpDy5NmbvUHxXoVbMd/I="; + sha256 = "sha256-lnHeU/X/2N81WPLakRYLs8TjpBhxBPhiXDJ+wNW0sU0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 414c435b35..925ec71d3f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -28,40 +28,41 @@ stdenv.mkDerivation rec { # TODO: Patch epoll so that the dbus actually responds # TODO: Figure out how to get privsep working, currently getting SIGBUS extraConfig = '' + #CONFIG_ELOOP_EPOLL=y + #CONFIG_PRIVSEP=y + #CONFIG_TLSV12=y see #8332 CONFIG_AP=y - CONFIG_LIBNL32=y + CONFIG_BGSCAN_LEARN=y + CONFIG_BGSCAN_SIMPLE=y + CONFIG_DEBUG_SYSLOG=y + CONFIG_EAP_EKE=y CONFIG_EAP_FAST=y - CONFIG_EAP_PWD=y - CONFIG_EAP_PAX=y - CONFIG_EAP_SAKE=y CONFIG_EAP_GPSK=y CONFIG_EAP_GPSK_SHA256=y + CONFIG_EAP_IKEV2=y + CONFIG_EAP_PAX=y + CONFIG_EAP_PWD=y + CONFIG_EAP_SAKE=y + CONFIG_ELOOP=eloop + CONFIG_HS20=y + CONFIG_HT_OVERRIDES=y + CONFIG_IEEE80211AC=y + CONFIG_IEEE80211N=y + CONFIG_IEEE80211R=y + CONFIG_IEEE80211W=y + CONFIG_INTERNETWORKING=y + CONFIG_L2_PACKET=linux + CONFIG_LIBNL32=y CONFIG_OWE=y + CONFIG_P2P=y + CONFIG_TDLS=y + CONFIG_TLS=openssl + CONFIG_TLSV11=y + CONFIG_VHT_OVERRIDES=y + CONFIG_WNM=y CONFIG_WPS=y CONFIG_WPS_ER=y CONFIG_WPS_NFS=y - CONFIG_EAP_IKEV2=y - CONFIG_EAP_EKE=y - CONFIG_HT_OVERRIDES=y - CONFIG_VHT_OVERRIDES=y - CONFIG_ELOOP=eloop - #CONFIG_ELOOP_EPOLL=y - CONFIG_L2_PACKET=linux - CONFIG_IEEE80211W=y - CONFIG_TLS=openssl - CONFIG_TLSV11=y - #CONFIG_TLSV12=y see #8332 - CONFIG_IEEE80211R=y - CONFIG_DEBUG_SYSLOG=y - #CONFIG_PRIVSEP=y - CONFIG_IEEE80211N=y - CONFIG_IEEE80211AC=y - CONFIG_INTERNETWORKING=y - CONFIG_HS20=y - CONFIG_P2P=y - CONFIG_TDLS=y - CONFIG_BGSCAN_SIMPLE=y - CONFIG_BGSCAN_LEARN=y '' + optionalString withPcsclite '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix new file mode 100644 index 0000000000..f04ccc569d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, kernel, fetchurl }: + +stdenv.mkDerivation rec { + name = "xone-${version}-${kernel.version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "medusalix"; + repo = "xone"; + rev = "v${version}"; + sha256 = "sha256-m4305Xl5w4nyAVqubjwWsiyPDVtfGykjlSW2eKEytVk="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + "VERSION=${version}" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "Linux kernel driver for Xbox One and Xbox Series X|S accessories"; + homepage = "https://github.com/medusalix/xone"; + license = licenses.gpl2; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix index 5e17519d4c..495a7094f9 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -14,6 +14,15 @@ rec { # The description needs to be overwritten for recursive types type = ...; + # Utility functions for convenience, or special interactions with the + # format (optional) + lib = { + exampleFunction = ... + # Types specific to the format (optional) + types = { ... }; + ... + }; + # generate :: Name -> Value -> Path # A function for generating a file with a value of such a type generate = ...; @@ -147,4 +156,202 @@ rec { ''; }; + + /* For configurations of Elixir project, like config.exs or runtime.exs + + Most Elixir project are configured using the [Config] Elixir DSL + + Since Elixir has more types than Nix, we need a way to map Nix types to + more than 1 Elixir type. To that end, this format provides its own library, + and its own set of types. + + To be more detailed, a Nix attribute set could correspond in Elixir to a + [Keyword list] (the more common type), or it could correspond to a [Map]. + + A Nix string could correspond in Elixir to a [String] (also called + "binary"), an [Atom], or a list of chars (usually discouraged). + + A Nix array could correspond in Elixir to a [List] or a [Tuple]. + + Some more types exists, like records, regexes, but since they are less used, + we can leave the `mkRaw` function as an escape hatch. + + For more information on how to use this format in modules, please refer to + the Elixir section of the Nixos documentation. + + TODO: special Elixir values doesn't show up nicely in the documentation + + [Config]: + [Keyword list]: + [Map]: + [String]: + [Atom]: + [List]: + [Tuple]: + */ + elixirConf = { elixir ? pkgs.elixir }: + with lib; let + toElixir = value: with builtins; + if value == null then "nil" else + if value == true then "true" else + if value == false then "false" else + if isInt value || isFloat value then toString value else + if isString value then string value else + if isAttrs value then attrs value else + if isList value then list value else + abort "formats.elixirConf: should never happen (value = ${value})"; + + escapeElixir = escape [ "\\" "#" "\"" ]; + string = value: "\"${escapeElixir value}\""; + + attrs = set: + if set ? _elixirType then specialType set + else + let + toKeyword = name: value: "${name}: ${toElixir value}"; + keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set); + in + "[" + keywordList + "]"; + + listContent = values: concatStringsSep ", " (map toElixir values); + + list = values: "[" + (listContent values) + "]"; + + specialType = { value, _elixirType }: + if _elixirType == "raw" then value else + if _elixirType == "atom" then value else + if _elixirType == "map" then elixirMap value else + if _elixirType == "tuple" then tuple value else + abort "formats.elixirConf: should never happen (_elixirType = ${_elixirType})"; + + elixirMap = set: + let + toEntry = name: value: "${toElixir name} => ${toElixir value}"; + entries = concatStringsSep ", " (mapAttrsToList toEntry set); + in + "%{${entries}}"; + + tuple = values: "{${listContent values}}"; + + toConf = values: + let + keyConfig = rootKey: key: value: + "config ${rootKey}, ${key}, ${toElixir value}"; + keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values; + rootConfigs = flatten (mapAttrsToList keyConfigs values); + in + '' + import Config + + ${concatStringsSep "\n" rootConfigs} + ''; + in + { + type = with lib.types; let + valueType = nullOr + (oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "Elixir value"; + }; + in + attrsOf (attrsOf (valueType)); + + lib = + let + mkRaw = value: { + inherit value; + _elixirType = "raw"; + }; + + in + { + inherit mkRaw; + + /* Fetch an environment variable at runtime, with optional fallback + */ + mkGetEnv = { envVariable, fallback ? null }: + mkRaw "System.get_env(${toElixir envVariable}, ${toElixir fallback})"; + + /* Make an Elixir atom. + + Note: lowercase atoms still need to be prefixed by ':' + */ + mkAtom = value: { + inherit value; + _elixirType = "atom"; + }; + + /* Make an Elixir tuple out of a list. + */ + mkTuple = value: { + inherit value; + _elixirType = "tuple"; + }; + + /* Make an Elixir map out of an attribute set. + */ + mkMap = value: { + inherit value; + _elixirType = "map"; + }; + + /* Contains Elixir types. Every type it exports can also be replaced + by raw Elixir code (i.e. every type is `either type rawElixir`). + + It also reexports standard types, wrapping them so that they can + also be raw Elixir. + */ + types = with lib.types; let + isElixirType = type: x: (x._elixirType or "") == type; + + rawElixir = mkOptionType { + name = "rawElixir"; + description = "raw elixir"; + check = isElixirType "raw"; + }; + + elixirOr = other: either other rawElixir; + in + { + inherit rawElixir elixirOr; + + atom = elixirOr (mkOptionType { + name = "elixirAtom"; + description = "elixir atom"; + check = isElixirType "atom"; + }); + + tuple = elixirOr (mkOptionType { + name = "elixirTuple"; + description = "elixir tuple"; + check = isElixirType "tuple"; + }); + + map = elixirOr (mkOptionType { + name = "elixirMap"; + description = "elixir map"; + check = isElixirType "map"; + }); + # Wrap standard types, since anything in the Elixir configuration + # can be raw Elixir + } // lib.mapAttrs (_name: type: elixirOr type) lib.types; + }; + + generate = name: value: pkgs.runCommandNoCC name + { + value = toConf value; + passAsFile = [ "value" ]; + nativeBuildInputs = [ elixir ]; + } '' + cp "$valuePath" "$out" + mix format "$out" + ''; + }; + } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index c07933129f..1e4e00f959 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,19 +1,19 @@ { fetchurl, fetchzip }: { "x86_64-darwin" = fetchzip { - sha256 = "sha256-hB3TL1FocAtLpBe+Rv2Pyon4f1ld+Fqapz6TUQ0O1jU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-mKCqFMkTei7n/eI9s3aiAKc4jdnRA121TOizRHON1ic=="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_darwin_amd64.zip"; }; "i686-linux" = fetchurl { - sha256 = "sha256-ZPHmFxKLJ1oxT18P6FDv74/leCzlESTrhNYuC8T6u+I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-N+S2BWUskEHt5YjpncmiurdgQ6TN35TWN8Zv7bM3a5k="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_386.tar.gz"; }; "x86_64-linux" = fetchurl { - sha256 = "sha256-yOvkEimDp646BCCFV2fnmVGe6R8geFlxtWLfPMVQ9Uk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-p665fB2lVSLpWIYlTNW+ZGOohpobdvOs0AIQ1l9BlmE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_amd64.tar.gz"; }; "aarch64-linux" = fetchurl { - sha256 = "sha256-ayNv2O0Ge3dT6YAN4SW/gsyoErCB3BJYsx/daMbGHjs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-oomkIHeQDTNDp6A6CcMv2s89PkuKpGVV4iLCxcj0Xsc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index cce9a1c159..0425116934 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.3"; + version = "0.107.4"; src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system}; diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 79f17f96b5..b4b8b410e5 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.0.2"; + version = "1.0.3"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-aI5uxfMR+UpwxbUsJNNYYjqVX2epk60JbqWHRhB4v7I="; + sha256 = "sha256-VApcTYARC6NaVmwXgpzW8xRE23refGudBgPsyq7Ypig="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/bird/default.nix b/third_party/nixpkgs/pkgs/servers/bird/default.nix index f87ff8c664..5c5fec3d89 100644 --- a/third_party/nixpkgs/pkgs/servers/bird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bird/default.nix @@ -1,66 +1,39 @@ { lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }: -with lib; +stdenv.mkDerivation rec { + pname = "bird"; + version = "2.0.9"; -let - - generic = { version, sha256, enableIPv6 ? false }: - stdenv.mkDerivation rec { - pname = "bird"; - inherit version; - - src = fetchurl { - inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ readline libssh ]; - - patches = [ - (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") - ] - ++ optional (lib.versionOlder version "2") - # https://github.com/BIRD/bird/pull/4 - (fetchpatch { - url = "https://github.com/BIRD/bird/commit/fca9ab48e3823c734886f47156a92f6b804c16e9.patch"; - sha256 = "1pnndc3n56lqqcy74ln0w5kn3i9rbzsm2dqiyp1qw7j33dpkln1b"; - }) - ; - - CPP="${stdenv.cc.targetPrefix}cpp -E"; - - configureFlags = [ - "--localstatedir=/var" - ] ++ optional enableIPv6 "--enable-ipv6"; - - passthru.tests = nixosTests.bird; - - meta = { - description = "BIRD Internet Routing Daemon"; - homepage = "http://bird.network.cz"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz globin ]; - platforms = platforms.linux; - }; - }; - -in - -{ - bird = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; - }; - - bird6 = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; - enableIPv6 = true; - }; - - bird2 = generic { - version = "2.0.9"; + src = fetchurl { sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4="; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; + }; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libssh ]; + + patches = [ + ./dont-create-sysconfdir-2.patch + (fetchurl { + url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch"; + sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ="; + }) + ]; + + CPP="${stdenv.cc.targetPrefix}cpp -E"; + + configureFlags = [ + "--localstatedir=/var" + "--runstatedir=/run/bird" + ]; + + passthru.tests = nixosTests.bird; + + meta = with lib; { + description = "BIRD Internet Routing Daemon"; + homepage = "http://bird.network.cz"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz globin ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch deleted file mode 100644 index 8f62670aee..0000000000 --- a/third_party/nixpkgs/pkgs/servers/bird/dont-create-sysconfdir-1.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -68,2 +68,2 @@ - install: all -- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir) -+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index e9f030dac7..251e442457 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.9"; + version = "4.4.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UxVJ8JKJ7L0Fgp4UuzRWMpTYW57d4sYToA9ZevITXo0="; + sha256 = "sha256-z81v3Zk0TKWn73wpQMJBvO9HH8MlK6PcvUxX4GOOiDY="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix new file mode 100644 index 0000000000..ba0dc66a74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "endlessh-go"; + version = "20220213"; + + src = fetchFromGitHub { + owner = "shizunge"; + repo = "endlessh-go"; + rev = version; + sha256 = "sha256-x/38w0GtzYBGWr0ZkfY2HmDEAUI54R833aH0RZSCTC0="; + }; + vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + proxyVendor = true; + + meta = with lib; { + homepage = "https://github.com/shizunge/endlessh-go"; + description = "An implementation of endlessh exporting Prometheus metrics"; + license = licenses.gpl3; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix index 3aad0460b3..3a3517f4f2 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libcap, openssl, pam }: +{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, nixosTests }: stdenv.mkDerivation rec { pname = "vsftpd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; - buildInputs = [ libcap openssl pam ]; + buildInputs = [ libcap openssl libseccomp pam ]; patches = [ ./CVE-2015-1419.patch ]; @@ -30,10 +30,14 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" ]; - NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; + NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp"; enableParallelBuilding = true; + passthru = { + tests = { inherit (nixosTests) vsftpd; }; + }; + meta = with lib; { description = "A very secure FTP daemon"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix index 32fcb856d2..ae198707ec 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk="; + sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI="; }; + cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g="; - cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY="; + patches = [ + # https://github.com/mbrubeck/agate/pull/143 + (fetchpatch { + name = "fix-port-collision.patch"; + url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch"; + sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s="; + }) + ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/headphones/default.nix b/third_party/nixpkgs/pkgs/servers/headphones/default.nix index a9403bf9ed..f39390f5ea 100644 --- a/third_party/nixpkgs/pkgs/servers/headphones/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headphones/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0-alpha.1"; + version = "0.6.0-beta.5"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "sha256-+mWtceQoHSMRkA8izZnKM0cgbt0P5Hr3arKOevpKvqc="; + sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v"; }; dontBuild = true; @@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/opt/headphones cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones echo v${version} > $out/opt/headphones/version.txt makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones + + runHook postInstall ''; meta = with lib; { description = "Automatic music downloader for SABnzbd"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/rembo10/headphones"; maintainers = with lib.maintainers; [ rembo10 ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index 1e7fa059d7..82b443c011 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-nVGhLL7HN9m5zIZOFVOMYZXxUUx3WkLpeH/59kXoTHo="; + sha256 = "sha256-9nBFBvYAhybg97oU4mi899ss4/nzBCY95KfdkSs2f8s="; }; - vendorSha256 = "sha256-v76UWaF6kdmuvABg6sDMmDpJ4HWvgliyEWAbAebK3wM="; + vendorSha256 = "sha256-qFoSK27D6bznksdm7Fl4SsVt13g2LSwuGe0As/MUo5o="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; 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 714087eb2e..472fa630ba 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 = "2022.2.9"; + version = "2022.3.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -44,7 +44,6 @@ "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ apcaccess ]; "api" = ps: with ps; [ aiohttp-cors ]; - "apns" = ps: with ps; [ ]; # missing inputs: apns2 "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ aprslib geopy ]; @@ -166,7 +165,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -188,12 +187,13 @@ "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; "discogs" = ps: with ps; [ discogs-client ]; - "discord" = ps: with ps; [ discordpy ]; + "discord" = ps: with ps; [ nextcord ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; + "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow pydoods ]; @@ -216,7 +216,7 @@ "ecobee" = ps: with ps; [ python-ecobee-api ]; "econet" = ps: with ps; [ pyeconet ]; "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; "efergy" = ps: with ps; [ pyefergy ]; @@ -224,7 +224,7 @@ "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ eliqonline ]; - "elkm1" = ps: with ps; [ elkm1-lib ]; + "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib ifaddr ]; "elmax" = ps: with ps; [ elmax-api ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; @@ -264,7 +264,7 @@ "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 + "fibaro" = ps: with ps; [ fiblary3-fork ]; "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; @@ -273,6 +273,7 @@ "fireservicerota" = ps: with ps; [ pyfireservicerota ]; "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; + "fivem" = ps: with ps; [ ]; # missing inputs: fivem-api "fixer" = ps: with ps; [ fixerio ]; "fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fleetgo" = ps: with ps; [ ritassist ]; @@ -324,7 +325,6 @@ "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ glances-api ]; - "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; @@ -446,7 +446,7 @@ "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kmtronic" = ps: with ps; [ pykmtronic ]; "knx" = ps: with ps; [ xknx ]; - "kodi" = ps: with ps; [ pykodi ]; + "kodi" = ps: with ps; [ aiohttp-cors pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ]; "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kraken" = ps: with ps; [ krakenex pykrakenapi ]; @@ -532,11 +532,12 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; + "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ]; "modern_forms" = ps: with ps; [ aiomodernforms ]; + "moehlenhoff_alpha2" = ps: with ps; [ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; @@ -680,6 +681,7 @@ "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "pure_energie" = ps: with ps; [ gridnet ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; "pushover" = ps: with ps; [ pushover-complete ]; @@ -697,6 +699,7 @@ "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; + "radio_browser" = ps: with ps; [ radios ]; "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy @@ -780,7 +783,7 @@ "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; - "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi + "signal_messenger" = ps: with ps; [ pysignalclirestapi ]; "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python ]; "simulated" = ps: with ps; [ ]; @@ -791,7 +794,7 @@ "skybeacon" = ps: with ps; [ pygatt ]; "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ slackclient ]; - "sleepiq" = ps: with ps; [ sleepyq ]; + "sleepiq" = ps: with ps; [ asyncsleepiq ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; @@ -814,7 +817,7 @@ "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; - "sonarr" = ps: with ps; [ sonarr ]; + "sonarr" = ps: with ps; [ aiopyarr ]; "songpal" = ps: with ps; [ python-songpal ]; "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sony_projector" = ps: with ps; [ pysdcp ]; @@ -924,7 +927,7 @@ "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twinkly" = ps: with ps; [ ttls ]; - "twitch" = ps: with ps; [ python-twitch-client ]; + "twitch" = ps: with ps; [ twitchapi ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; "ue_smart_radio" = ps: with ps; [ ]; @@ -967,7 +970,7 @@ "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ pyvolumio ]; - "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall + "volvooncall" = ps: with ps; [ volvooncall ]; "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; @@ -990,6 +993,7 @@ "wilight" = ps: with ps; [ pywilight ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api + "wiz" = ps: with ps; [ aiohttp-cors ifaddr pywizlight ]; "wled" = ps: with ps; [ wled ]; "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays ]; @@ -998,7 +1002,6 @@ "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; - "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; @@ -1031,6 +1034,7 @@ "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; + "zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws }; # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ @@ -1143,6 +1147,7 @@ "directv" "discovery" "dlna_dmr" + "dlna_dms" "dnsip" "doorbird" "dsmr" @@ -1343,6 +1348,7 @@ "min_max" "minecraft_server" "minio" + "mjpeg" "mobile_app" "modbus" "modem_callerid" @@ -1423,6 +1429,7 @@ "prometheus" "prosegur" "proximity" + "pure_energie" "push" "pushbullet" "pvoutput" @@ -1431,6 +1438,7 @@ "qld_bushfire" "rachio" "radarr" + "radio_browser" "rainforest_eagle" "rainmachine" "random" @@ -1459,6 +1467,7 @@ "safe_mode" "samsungtv" "scene" + "scrape" "screenlogic" "script" "search" @@ -1476,6 +1485,7 @@ "sia" "sigfox" "sighthound" + "signal_messenger" "simplisafe" "simulated" "siren" @@ -1604,6 +1614,7 @@ "whois" "wiffi" "wilight" + "wiz" "wled" "workday" "worldclock" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 920343de67..22a253e650 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -29,7 +29,27 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") + + # pytest-aiohttp>0.3.0 breaks home-assistant tests + (self: super: { + pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "0.3.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + }; + }); + aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + }) (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +78,7 @@ let }) # Pinned due to API changes in 0.1.0 - (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") # Pinned due to API changes >0.3.5.3 (self: super: { @@ -105,12 +125,12 @@ let }) ]; - mkOverride = attrName: version: sha256: + mkOverride = attrName: version: hash: self: super: { ${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { - inherit version sha256; + inherit version hash; }; }); }; @@ -138,7 +158,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.9"; + hassVersion = "2022.3.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -156,7 +176,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-So/MAKyFVa1TchrVE4ego1fRbgOXCoXR3w/rJLFSBqI="; + hash = "sha256-bihb6DL8hQuRnJZp39Lh2qfTXr0tFxn7FHFZewttNOc="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -217,6 +237,8 @@ in python.pkgs.buildPythonApplication rec { yarl # Not in setup.py, but used in homeassistant/util/package.py setuptools + # Not in setup.py, but uncounditionally imported via tests/conftest.py + paho-mqtt ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 2aabb0d931..d65ee309d2 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 = "20220203.1"; + version = "20220301.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-6+TzBhHo9+eo6Hlk8RF+BAt4O0i759iAN+dKAPDmTNY="; + sha256 = "sha256-Gshw8GIiZfFHmldvxBhUKZ5NFWuBIA6ug7m7eEfQ+ao="; }; # 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 fbe46b2377..0e3d5d5553 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -34,16 +34,12 @@ from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "home-assistant.python.pkgs" -# If some requirements are matched by multiple Python packages, -# the following can be used to choose one of them +# If some requirements are matched by multiple or no Python packages, the +# following can be used to choose the correct one PKG_PREFERENCES = { - # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl - "youtube-dl": "youtube-dl-light", - "tensorflow-bin": "tensorflow", - "tensorflow-bin_2": "tensorflow", - "tensorflowWithoutCuda": "tensorflow", - "tensorflow-build_2": "tensorflow", - "whois": "python-whois", + "youtube_dl": "youtube-dl-light", + "tensorflow": "tensorflow", + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 } @@ -120,39 +116,28 @@ def dump_packages() -> Dict[str, Dict[str, str]]: def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - attr_paths = set() + if req in PKG_PREFERENCES: + return f"{PKG_SET}.{PKG_PREFERENCES[req]}" + attr_paths = [] names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) - # Add name variant without extra_require, e.g. samsungctl - # instead of samsungctl[websocket] - if req.endswith("]"): - names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) # python(minor).(major)-(pname)-(version or unstable-date) # we need the version qualifier, or we'll have multiple matches # (e.g. pyserial and pyserial-asyncio when looking for pyserial) - pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I) + pattern = re.compile(f"^python\\d\\.\\d-{name}-(?:\\d|unstable-.*)", re.I) for attr_path, package in packages.items(): if pattern.match(package["name"]): - attr_paths.add(attr_path) - if len(attr_paths) > 1: - for to_replace, replacement in PKG_PREFERENCES.items(): - try: - attr_paths.remove(PKG_SET + "." + to_replace) - attr_paths.add(PKG_SET + "." + replacement) - except KeyError: - pass + attr_paths.append(attr_path) # Let's hope there's only one derivation with a matching name - assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format( - req, attr_paths - ) - if len(attr_paths) == 1: - return attr_paths.pop() + assert len(attr_paths) <= 1, f"{req} matches more than one derivation: {attr_paths}" + if attr_paths: + return attr_paths[0] else: return None @@ -180,6 +165,10 @@ def main() -> None: # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] name, required_version = req.split("==", maxsplit=1) + # Remove extra_require from name, e.g. samsungctl instead of + # samsungctl[websocket] + if name.endswith("]"): + name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) if our_version := get_pkg_version(name, packages): if Version.parse(our_version) < Version.parse(required_version): diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 31dbe64725..ae2d91b933 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -11,8 +11,9 @@ let config = [ pydispatcher ]; generic = [ ha-av ]; google_translate = [ mutagen ]; + lovelace = [ PyChromecast ]; nest = [ ha-av ]; - onboarding = [ pymetno rpi-bad-power ]; + onboarding = [ pymetno radios rpi-bad-power ]; version = [ aioaseko ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; @@ -28,6 +29,13 @@ let ]; }; + extraDisabledTests = { + roku = [ + # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) + "test_services_play_media_audio" + ]; + }; + extraPytestFlagsArray = { asuswrt = [ # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error @@ -45,6 +53,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; + disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray @@ -59,6 +68,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( broken = lib.elem component [ "airtouch4" "dnsip" + "zwave" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch deleted file mode 100644 index 4bf0a0d0e9..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch +++ /dev/null @@ -1,2980 +0,0 @@ -From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001 -From: danzh -Date: Mon, 16 Nov 2020 14:27:13 -0500 -Subject: [PATCH] quiche: update QUICHE tar (#13949) - -Signed-off-by: Dan Zhang ---- - bazel/envoy_internal.bzl | 2 + - bazel/external/quiche.BUILD | 85 +-- - bazel/repository_locations.bzl | 6 +- - source/extensions/quic_listeners/quiche/BUILD | 1 + - .../quiche/active_quic_listener.cc | 2 +- - .../quiche/envoy_quic_client_connection.cc | 2 +- - .../quiche/envoy_quic_client_stream.cc | 1 + - .../quiche/envoy_quic_connection.cc | 6 +- - .../quiche/envoy_quic_connection.h | 1 + - .../quiche/envoy_quic_dispatcher.cc | 6 +- - .../quiche/envoy_quic_dispatcher.h | 2 +- - .../quiche/envoy_quic_proof_source.cc | 2 +- - .../quiche/envoy_quic_proof_source.h | 2 +- - .../quiche/envoy_quic_proof_source_base.cc | 7 +- - .../quiche/envoy_quic_proof_source_base.h | 6 +- - .../quiche/envoy_quic_proof_verifier_base.cc | 4 +- - .../quiche/envoy_quic_server_connection.cc | 10 +- - .../quiche/envoy_quic_server_connection.h | 1 + - .../quic_listeners/quiche/platform/BUILD | 42 +- - .../quiche/platform/flags_impl.cc | 108 +++- - .../quiche/platform/flags_impl.h | 46 +- - .../quiche/platform/flags_list.h | 502 ------------------ - .../quiche/platform/http2_flags_impl.h | 4 +- - .../quiche/platform/quic_aligned_impl.h | 18 - - .../quiche/platform/quic_cert_utils_impl.cc | 38 +- - .../quiche/platform/quic_cert_utils_impl.h | 9 +- - .../quiche/platform/quic_fallthrough_impl.h | 11 - - .../quiche/platform/quic_file_utils_impl.cc | 4 +- - .../quiche/platform/quic_file_utils_impl.h | 6 +- - .../quiche/platform/quic_flags_impl.h | 6 +- - .../platform/quic_hostname_utils_impl.cc | 6 +- - .../platform/quic_hostname_utils_impl.h | 8 +- - .../quiche/platform/quic_macros_impl.h | 13 - - .../platform/quic_mem_slice_span_impl.cc | 3 +- - .../platform/quic_mem_slice_span_impl.h | 9 +- - ..._ptr_util_impl.h => quic_testvalue_impl.h} | 11 +- - .../platform/quic_udp_socket_platform_impl.h | 3 + - .../quiche/platform/quiche_arraysize_impl.h | 11 - - .../quiche/platform/quiche_optional_impl.h | 17 - - .../quiche/platform/quiche_text_utils_impl.h | 63 +-- - .../quiche/platform/quiche_time_utils_impl.cc | 4 +- - .../quiche/platform/quiche_time_utils_impl.h | 4 +- - .../platform/spdy_endianness_util_impl.h | 29 - - .../quiche/platform/spdy_flags_impl.h | 4 +- - .../quiche/platform/spdy_string_utils_impl.h | 2 +- - .../spdy_server_push_utils_for_envoy.cc | 10 +- - .../quiche/envoy_quic_client_session_test.cc | 2 +- - .../quiche/envoy_quic_client_stream_test.cc | 44 +- - .../quiche/envoy_quic_proof_source_test.cc | 6 +- - .../quiche/envoy_quic_proof_verifier_test.cc | 8 +- - .../quiche/envoy_quic_server_session_test.cc | 3 +- - .../quiche/envoy_quic_server_stream_test.cc | 53 +- - .../quic_listeners/quiche/platform/BUILD | 22 - - .../quiche/platform/http2_platform_test.cc | 22 +- - .../quiche/platform/quic_platform_test.cc | 61 +-- - .../quiche/platform/quic_test_output_impl.cc | 15 +- - .../quiche/platform/quic_test_output_impl.h | 12 +- - .../quiche/platform/quiche_platform_test.cc | 39 -- - .../quiche/platform/spdy_platform_test.cc | 20 +- - .../quic_listeners/quiche/test_proof_source.h | 2 +- - .../quic_listeners/quiche/test_utils.h | 4 +- - 61 files changed, 396 insertions(+), 1054 deletions(-) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h - rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h - delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc - -diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl -index 5ad86609a..3f9ddfd23 100644 ---- a/bazel/envoy_internal.bzl -+++ b/bazel/envoy_internal.bzl -@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False): - }) + select({ - repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"], - repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], -+ # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5 -+ repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"], - "//conditions:default": [], - }) + select({ - repository + "//bazel:no_debug_info": ["-g0"], -diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD -index 7541909aa..b6b208fc5 100644 ---- a/bazel/external/quiche.BUILD -+++ b/bazel/external/quiche.BUILD -@@ -57,16 +57,12 @@ quiche_common_copts = [ - "-Wno-unused-function", - # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames. - "-Wno-invalid-offsetof", -- "-Wno-range-loop-analysis", - ] - - quiche_copts = select({ - # Ignore unguarded #pragma GCC statements in QUICHE sources - "@envoy//bazel:windows_x86_64": ["-wd4068"], - # Remove these after upstream fix. -- "@envoy//bazel:gcc_build": [ -- "-Wno-sign-compare", -- ] + quiche_common_copts, - "//conditions:default": quiche_common_copts, - }) - -@@ -737,7 +733,6 @@ envoy_cc_library( - hdrs = [ - "quiche/spdy/platform/api/spdy_bug_tracker.h", - "quiche/spdy/platform/api/spdy_containers.h", -- "quiche/spdy/platform/api/spdy_endianness_util.h", - "quiche/spdy/platform/api/spdy_estimate_memory_usage.h", - "quiche/spdy/platform/api/spdy_flags.h", - "quiche/spdy/platform/api/spdy_logging.h", -@@ -935,6 +930,7 @@ envoy_cc_library( - copts = quiche_copts, - repository = "@envoy", - deps = [ -+ ":http2_hpack_huffman_hpack_huffman_encoder_lib", - ":spdy_core_protocol_lib", - ":spdy_platform", - ], -@@ -1049,19 +1045,16 @@ envoy_cc_library( - envoy_cc_library( - name = "quic_platform_base", - hdrs = [ -- "quiche/quic/platform/api/quic_aligned.h", - "quiche/quic/platform/api/quic_bug_tracker.h", - "quiche/quic/platform/api/quic_client_stats.h", - "quiche/quic/platform/api/quic_containers.h", - "quiche/quic/platform/api/quic_error_code_wrappers.h", - "quiche/quic/platform/api/quic_estimate_memory_usage.h", - "quiche/quic/platform/api/quic_exported_stats.h", -- "quiche/quic/platform/api/quic_fallthrough.h", - "quiche/quic/platform/api/quic_flag_utils.h", - "quiche/quic/platform/api/quic_flags.h", - "quiche/quic/platform/api/quic_iovec.h", - "quiche/quic/platform/api/quic_logging.h", -- "quiche/quic/platform/api/quic_macros.h", - "quiche/quic/platform/api/quic_map_util.h", - "quiche/quic/platform/api/quic_mem_slice.h", - "quiche/quic/platform/api/quic_prefetch.h", -@@ -1072,6 +1065,7 @@ envoy_cc_library( - "quiche/quic/platform/api/quic_stream_buffer_allocator.h", - "quiche/quic/platform/api/quic_string_utils.h", - "quiche/quic/platform/api/quic_uint128.h", -+ "quiche/quic/platform/api/quic_testvalue.h", - # TODO: uncomment the following files as implementations are added. - # "quiche/quic/platform/api/quic_fuzzed_data_provider.h", - # "quiche/quic/platform/api/quic_test_loopback.h", -@@ -1147,7 +1141,6 @@ envoy_cc_test_library( - hdrs = ["quiche/quic/platform/api/quic_port_utils.h"], - repository = "@envoy", - tags = ["nofips"], -- deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"], - ) - - envoy_cc_library( -@@ -1216,15 +1209,14 @@ envoy_cc_test_library( - ) - - envoy_cc_library( -- name = "quiche_common_platform_endian", -- hdrs = ["quiche/common/platform/api/quiche_endian.h"], -+ name = "quiche_common_endian_lib", -+ hdrs = ["quiche/common/quiche_endian.h"], - repository = "@envoy", - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = - [ - ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib", - ], - ) - -@@ -1932,6 +1924,7 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quic_core_clock_lib", -+ ":quic_core_crypto_certificate_view_lib", - ":quic_core_crypto_encryption_lib", - ":quic_core_crypto_hkdf_lib", - ":quic_core_crypto_proof_source_interface_lib", -@@ -2167,6 +2160,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_framer_lib", - srcs = ["quiche/quic/core/quic_framer.cc"], -@@ -2339,6 +2341,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":http2_constants_lib", - ":quic_core_data_lib", - ":quic_core_error_codes_lib", - ":quic_core_http_http_frames_lib", -@@ -2723,6 +2726,27 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_path_validator_lib", -+ srcs = ["quiche/quic/core/quic_path_validator.cc"], -+ hdrs = ["quiche/quic/core/quic_path_validator.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ deps = [ -+ ":quic_core_alarm_factory_interface_lib", -+ ":quic_core_alarm_interface_lib", -+ ":quic_core_arena_scoped_ptr_lib", -+ ":quic_core_clock_lib", -+ ":quic_core_constants_lib", -+ ":quic_core_crypto_random_lib", -+ ":quic_core_one_block_arena_lib", -+ ":quic_core_packet_writer_interface_lib", -+ ":quic_core_types_lib", -+ ":quic_platform", -+ ], -+) -+ - envoy_cc_library( - name = "quic_core_process_packet_interface_lib", - hdrs = ["quiche/quic/core/quic_process_packet_interface.h"], -@@ -2735,6 +2759,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_protocol_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_qpack_blocking_manager_lib", - srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"], -@@ -2896,6 +2929,7 @@ envoy_cc_library( - deps = [ - ":http2_decoder_decode_buffer_lib", - ":http2_decoder_decode_status_lib", -+ ":quic_core_error_codes_lib", - ":quic_core_qpack_qpack_instruction_decoder_lib", - ":quic_core_qpack_qpack_instructions_lib", - ":quic_core_qpack_qpack_stream_receiver_lib", -@@ -3368,7 +3402,7 @@ envoy_cc_library( - ":quic_core_error_codes_lib", - ":quic_core_time_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3420,6 +3454,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":quic_core_circular_deque_lib", - ":quic_core_connection_stats_lib", - ":quic_core_packets_lib", - ":quic_core_session_notifier_interface_lib", -@@ -3459,6 +3494,7 @@ envoy_cc_library( - deps = [ - ":quic_core_versions_lib", - ":quic_platform_base", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3475,7 +3511,6 @@ envoy_cc_library( - ":quic_core_tag_lib", - ":quic_core_types_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3746,6 +3781,7 @@ envoy_cc_test_library( - ":quic_core_packet_creator_lib", - ":quic_core_packet_writer_interface_lib", - ":quic_core_packets_lib", -+ ":quic_core_path_validator_lib", - ":quic_core_received_packet_manager_lib", - ":quic_core_sent_packet_manager_lib", - ":quic_core_server_id_lib", -@@ -3836,25 +3872,10 @@ envoy_cc_test_library( - deps = [":epoll_server_platform"], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional", -- hdrs = ["quiche/common/platform/api/quiche_optional.h"], -- repository = "@envoy", -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib", -- ], --) -- - envoy_cc_library( - name = "quiche_common_platform", - hdrs = [ -- "quiche/common/platform/api/quiche_arraysize.h", - "quiche/common/platform/api/quiche_logging.h", -- "quiche/common/platform/api/quiche_optional.h", -- "quiche/common/platform/api/quiche_ptr_util.h", - "quiche/common/platform/api/quiche_str_cat.h", - "quiche/common/platform/api/quiche_string_piece.h", - "quiche/common/platform/api/quiche_text_utils.h", -@@ -3866,7 +3887,6 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quiche_common_platform_export", -- ":quiche_common_platform_optional", - "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib", - ], - ) -@@ -3874,7 +3894,6 @@ envoy_cc_library( - envoy_cc_test_library( - name = "quiche_common_platform_test", - srcs = [ -- "quiche/common/platform/api/quiche_endian_test.cc", - "quiche/common/platform/api/quiche_str_cat_test.cc", - "quiche/common/platform/api/quiche_text_utils_test.cc", - "quiche/common/platform/api/quiche_time_utils_test.cc", -@@ -3884,7 +3903,6 @@ envoy_cc_test_library( - tags = ["nofips"], - deps = [ - ":quiche_common_platform", -- ":quiche_common_platform_endian", - "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib", - ], - ) -@@ -3904,8 +3922,8 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = [ -+ ":quiche_common_endian_lib", - ":quiche_common_platform", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3944,6 +3962,7 @@ envoy_cc_test( - deps = [ - ":http2_platform", - ":http2_test_tools_random", -+ ":quiche_common_test_tools_test_utils_lib", - ], - ) - -diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl -index 6eba5a821..19ddc76e8 100644 ---- a/bazel/repository_locations.bzl -+++ b/bazel/repository_locations.bzl -@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( - project_name = "QUICHE", - project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", - project_url = "https://quiche.googlesource.com/quiche", -- # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz -- version = "f555d99a084cdd086a349548c70fb558ac5847cf", -- sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351", -+ # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz -+ version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea", -+ sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859", - urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"], - use_category = ["dataplane_ext"], - extensions = ["envoy.transport_sockets.quic"], -diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD -index 29eb78d15..a90cfde6d 100644 ---- a/source/extensions/quic_listeners/quiche/BUILD -+++ b/source/extensions/quic_listeners/quiche/BUILD -@@ -212,6 +212,7 @@ envoy_cc_library( - "//source/common/buffer:buffer_lib", - "//source/common/common:assert_lib", - "//source/common/http:header_map_lib", -+ "//source/common/http:header_utility_lib", - "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib", - "@com_googlesource_quiche//:quic_core_http_client_lib", - ], -diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -index f4808adc5..86912292a 100644 ---- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc -+++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener( - quic::QuicRandom* const random = quic::QuicRandom::GetInstance(); - random->RandBytes(random_seed_, sizeof(random_seed_)); - crypto_config_ = std::make_unique( -- quiche::QuicheStringPiece(reinterpret_cast(random_seed_), sizeof(random_seed_)), -+ absl::string_view(reinterpret_cast(random_seed_), sizeof(random_seed_)), - quic::QuicRandom::GetInstance(), - std::make_unique(listen_socket_, listener_config.filterChainManager(), - stats_), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -index e79b08ad9..95d63729d 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection( - const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher, - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicConnection( -- server_connection_id, -+ server_connection_id, quic::QuicSocketAddress(), - envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper, - alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions, - std::move(connection_socket)), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -index 866e35416..a759b26b1 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -@@ -20,6 +20,7 @@ - - #include "common/buffer/buffer_impl.h" - #include "common/http/header_map_impl.h" -+#include "common/http/header_utility.h" - #include "common/common/assert.h" - - namespace Envoy { -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -index dcc311a6e..d813dfe4b 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -@@ -6,6 +6,7 @@ namespace Envoy { - namespace Quic { - - EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, -@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co - quic::Perspective perspective, - const quic::ParsedQuicVersionVector& supported_versions, - Network::ConnectionSocketPtr&& connection_socket) -- : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory, -- writer, owns_writer, perspective, supported_versions), -+ : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address, -+ &helper, &alarm_factory, writer, owns_writer, perspective, -+ supported_versions), - connection_socket_(std::move(connection_socket)) {} - - EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -index f4c8589d7..f8543bc93 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection, - protected Logger::Loggable { - public: - EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -index ba8f7f3a8..e6351f643 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i - } - - std::unique_ptr EnvoyQuicDispatcher::CreateQuicSession( -- quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/, -+ quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address, -+ const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/, - const quic::ParsedQuicVersion& version) { - auto quic_connection = std::make_unique( -- server_connection_id, peer_address, *helper(), *alarm_factory(), writer(), -+ server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(), - /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_); - auto quic_session = std::make_unique( - config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -index 589ff5327..d59307f41 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -@@ -62,7 +62,7 @@ protected: - std::unique_ptr - CreateQuicSession(quic::QuicConnectionId server_connection_id, - const quic::QuicSocketAddress& self_address, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn, -+ const quic::QuicSocketAddress& peer_address, absl::string_view alpn, - const quic::ParsedQuicVersion& version) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -index 1f65e4e7e..967765829 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address - - void EnvoyQuicProofSource::signPayload( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) { - CertConfigWithFilterChain res = - getTlsCertConfigAndFilterChain(server_address, client_address, hostname); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -index 6e1c74c92..e22bf3465 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -@@ -28,7 +28,7 @@ protected: - // quic::ProofSource - void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, -- uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -index 2c82c04d9..9ad3cb07f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - const std::string& hostname, - const std::string& server_config, - quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr callback) { - quic::QuicReferenceCountedPointer chain = - GetCertChain(server_address, client_address, hostname); -@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - auto signature_callback = std::make_unique(std::move(callback), chain); - - signPayload(server_address, client_address, hostname, sign_alg, -- quiche::QuicheStringPiece(payload.get(), payload_size), -- std::move(signature_callback)); -+ absl::string_view(payload.get(), payload_size), std::move(signature_callback)); - } - - void EnvoyQuicProofSourceBase::ComputeTlsSignature( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) { - signPayload(server_address, client_address, hostname, signature_algorithm, in, - std::move(callback)); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -index b7d76981e..a9e7e8c3f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -@@ -57,7 +57,7 @@ public: - void GetProof(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, - const std::string& server_config, quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr callback) override; - - TicketCrypter* GetTicketCrypter() override { return nullptr; } -@@ -65,14 +65,14 @@ public: - void ComputeTlsSignature(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) override; - - protected: - virtual void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) PURE; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -index 229b3ab36..e37590529 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi - *error_details = "QuicPacketWriter error."; - return false; - } -- bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size), -- signature, sign_alg); -+ bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature, -+ sign_alg); - if (!valid) { - *error_details = "Signature is not valid."; - } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -index b8fa94221..974c6c8eb 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -@@ -11,11 +11,13 @@ namespace Quic { - - EnvoyQuicServerConnection::EnvoyQuicServerConnection( - const quic::QuicConnectionId& server_connection_id, -- quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper, -- quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer, -+ quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address, -+ quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory, -+ quic::QuicPacketWriter* writer, bool owns_writer, - const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket) -- : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer, -- owns_writer, quic::Perspective::IS_SERVER, supported_versions, -+ : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper, -+ alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER, -+ supported_versions, - std::make_unique( - // Wraps the real IoHandle instance so that if the connection socket - // gets closed, the real IoHandle won't be affected. -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -index 7b7fac05e..7625fad02 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -@@ -10,6 +10,7 @@ namespace Quic { - class EnvoyQuicServerConnection : public EnvoyQuicConnection { - public: - EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD -index f53e07b58..839664d52 100644 ---- a/source/extensions/quic_listeners/quiche/platform/BUILD -+++ b/source/extensions/quic_listeners/quiche/platform/BUILD -@@ -36,15 +36,16 @@ envoy_extension_package() - envoy_cc_library( - name = "flags_impl_lib", - srcs = ["flags_impl.cc"], -- hdrs = [ -- "flags_impl.h", -- "flags_list.h", -- ], -+ hdrs = ["flags_impl.h"], - external_deps = [ - "abseil_base", - "abseil_synchronization", - ], - visibility = ["//visibility:public"], -+ deps = [ -+ "@com_googlesource_quiche//:quic_core_flags_list_lib", -+ "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib", -+ ], - ) - - envoy_cc_library( -@@ -62,7 +63,6 @@ envoy_cc_library( - envoy_cc_library( - name = "http2_platform_impl_lib", - hdrs = [ -- "http2_arraysize_impl.h", - "http2_bug_tracker_impl.h", - "http2_containers_impl.h", - "http2_estimate_memory_usage_impl.h", -@@ -74,7 +74,6 @@ envoy_cc_library( - ], - external_deps = [ - "abseil_base", -- "abseil_optional", - "abseil_str_format", - ], - visibility = ["//visibility:public"], -@@ -114,16 +113,13 @@ envoy_cc_library( - "quic_mem_slice_impl.cc", - ], - hdrs = [ -- "quic_aligned_impl.h", - "quic_client_stats_impl.h", - "quic_containers_impl.h", - "quic_error_code_wrappers_impl.h", - "quic_estimate_memory_usage_impl.h", -- "quic_fallthrough_impl.h", - "quic_flag_utils_impl.h", - "quic_flags_impl.h", - "quic_iovec_impl.h", -- "quic_macros_impl.h", - "quic_map_util_impl.h", - "quic_mem_slice_impl.h", - "quic_prefetch_impl.h", -@@ -132,6 +128,7 @@ envoy_cc_library( - "quic_server_stats_impl.h", - "quic_stack_trace_impl.h", - "quic_stream_buffer_allocator_impl.h", -+ "quic_testvalue_impl.h", - "quic_uint128_impl.h", - ], - external_deps = [ -@@ -141,7 +138,6 @@ envoy_cc_library( - "abseil_memory", - "abseil_node_hash_map", - "abseil_node_hash_set", -- "abseil_optional", - ], - tags = ["nofips"], - visibility = ["//visibility:public"], -@@ -236,6 +232,7 @@ envoy_cc_library( - }), - repository = "@envoy", - tags = ["nofips"], -+ visibility = ["//visibility:public"], - ) - - envoy_cc_library( -@@ -250,23 +247,12 @@ envoy_cc_library( - ], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional_impl_lib", -- hdrs = ["quiche_optional_impl.h"], -- external_deps = [ -- "abseil_node_hash_map", -- ], -- visibility = ["//visibility:public"], --) -- - envoy_cc_library( - name = "quiche_common_platform_impl_lib", - srcs = ["quiche_time_utils_impl.cc"], - hdrs = [ -- "quiche_arraysize_impl.h", - "quiche_logging_impl.h", - "quiche_map_util_impl.h", -- "quiche_ptr_util_impl.h", - "quiche_str_cat_impl.h", - "quiche_string_piece_impl.h", - "quiche_text_utils_impl.h", -@@ -281,17 +267,14 @@ envoy_cc_library( - deps = [ - ":quic_platform_logging_impl_lib", - ":string_utils_lib", -- "@com_googlesource_quiche//:quiche_common_platform_optional", - ], - ) - - envoy_cc_library( - name = "spdy_platform_impl_lib", - hdrs = [ -- "spdy_arraysize_impl.h", - "spdy_bug_tracker_impl.h", - "spdy_containers_impl.h", -- "spdy_endianness_util_impl.h", - "spdy_estimate_memory_usage_impl.h", - "spdy_flags_impl.h", - "spdy_logging_impl.h", -@@ -331,14 +314,3 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - ) -- --envoy_cc_library( -- name = "quiche_common_platform_endian_impl_lib", -- hdrs = ["quiche_endian_impl.h"], -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- "quiche_common_platform_export_impl_lib", -- "//source/common/common:byte_order_lib", -- ], --) -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -index 70fb182d6..9d4ea89ce 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -@@ -15,12 +15,24 @@ namespace quiche { - - namespace { - --absl::flat_hash_map MakeFlagMap() { -+absl::flat_hash_map makeFlagMap() { - absl::flat_hash_map flags; - --#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag); -+#include "quiche/quic/core/quic_flags_list.h" -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - return flags; - } -@@ -28,75 +40,123 @@ absl::flat_hash_map MakeFlagMap() { - } // namespace - - // static --FlagRegistry& FlagRegistry::GetInstance() { -+FlagRegistry& FlagRegistry::getInstance() { - static auto* instance = new FlagRegistry(); - return *instance; - } - --FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {} -+FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {} - --void FlagRegistry::ResetFlags() const { -+void FlagRegistry::resetFlags() const { - for (auto& kv : flags_) { -- kv.second->ResetValue(); -+ kv.second->resetValue(); - } - } - --Flag* FlagRegistry::FindFlag(const std::string& name) const { -+Flag* FlagRegistry::findFlag(const std::string& name) const { - auto it = flags_.find(name); - return (it != flags_.end()) ? it->second : nullptr; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - static const auto* kTrueValues = new std::set({"1", "t", "true", "y", "yes"}); - static const auto* kFalseValues = new std::set({"0", "f", "false", "n", "no"}); - auto lower = absl::AsciiStrToLower(value_str); - if (kTrueValues->find(lower) != kTrueValues->end()) { -- SetValue(true); -+ setValue(true); - return true; - } - if (kFalseValues->find(lower) != kFalseValues->end()) { -- SetValue(false); -+ setValue(false); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - int32_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - int64_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - double value; - if (absl::SimpleAtod(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -- SetValue(value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ setValue(value_str); - return true; - } - -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ unsigned long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ unsigned long long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ - // Flag definitions --#define QUICHE_FLAG(type, flag, value, help) \ -- TypedFlag* FLAGS_##flag = new TypedFlag(#flag, value, help); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, value) TypedFlag* flag = new TypedFlag(#flag, value, ""); -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+ -+#undef QUIC_FLAG -+ -+#define STRINGIFY(X) #X -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ -+ TypedFlag* FLAGS_##flag = new TypedFlag(STRINGIFY(FLAGS_##flag), value, help); -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc) -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc) -+ -+// Select the right macro based on the number of arguments. -+#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6 -+ -+#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...) \ -+ GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \ -+ DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE) -+ -+#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -index 5db939925..83ed8430c 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -@@ -26,13 +26,13 @@ public: - ~FlagRegistry() = default; - - // Return singleton instance. -- static FlagRegistry& GetInstance(); -+ static FlagRegistry& getInstance(); - - // Reset all registered flags to their default values. -- void ResetFlags() const; -+ void resetFlags() const; - - // Look up a flag by name. -- Flag* FindFlag(const std::string& name) const; -+ Flag* findFlag(const std::string& name) const; - - private: - FlagRegistry(); -@@ -48,10 +48,10 @@ public: - virtual ~Flag() = default; - - // Set flag value from given string, returning true iff successful. -- virtual bool SetValueFromString(const std::string& value_str) = 0; -+ virtual bool setValueFromString(const std::string& value_str) = 0; - - // Reset flag to default value. -- virtual void ResetValue() = 0; -+ virtual void resetValue() = 0; - - // Return flag name. - std::string name() const { return name_; } -@@ -70,15 +70,15 @@ public: - TypedFlag(const char* name, T default_value, const char* help) - : Flag(name, help), value_(default_value), default_value_(default_value) {} - -- bool SetValueFromString(const std::string& value_str) override; -+ bool setValueFromString(const std::string& value_str) override; - -- void ResetValue() override { -+ void resetValue() override { - absl::MutexLock lock(&mutex_); - value_ = default_value_; - } - - // Set flag value. -- void SetValue(T value) { -+ void setValue(T value) { - absl::MutexLock lock(&mutex_); - value_ = value; - } -@@ -96,15 +96,29 @@ private: - }; - - // SetValueFromString specializations --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); - - // Flag declarations --#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag* FLAGS_##flag; --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) extern TypedFlag* flag; -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag* FLAGS_##flag; -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h -deleted file mode 100644 -index 7e9e20a7c..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/flags_list.h -+++ /dev/null -@@ -1,502 +0,0 @@ --// This file intentionally does not have header guards. It is intended to be --// included multiple times, each time with a different definition of --// QUICHE_FLAG. -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --// This file is generated by //third_party/quic/tools:quic_flags_list in --// Google3. -- --#if defined(QUICHE_FLAG) -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false, -- "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities in HTTP2.") -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_load_based_goaway_warning, false, -- "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false, -- "If true, check whether client meets security requirements during SSL handshake. If " -- "flag is true and client does not meet security requirements, do not negotiate HTTP/2 " -- "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is " -- "already negotiated. The spec contains both cipher and TLS version requirements.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false, -- "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false, -- "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade " -- "requests/responses.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true, -- "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC " -- "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false, -- "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false, -- "When true, ensure the ACK delay is never less than the alarm granularity when ACK " -- "decimation is enabled.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false, -- "If true, add missing connected checks.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true, -- "If true, when server is silently closing connections due to idle timeout, serialize " -- "the connection close packets which will be added to time wait list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false, -- "If true, include stream information in idle timeout connection close detail.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false, -- "If true, check backend response header for X-Response-Ttl. If it is provided, the " -- "stream TTL is set. A QUIC stream will be immediately canceled when tries to write " -- "data if this TTL expired.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true, -- "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false, -- "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false, -- "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false, -- "When true, the 1RTT and 2RTT connection options decrease the number of round trips in " -- "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false, -- "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false, -- "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing " -- "during PROBE_UP.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false, -- "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in " -- "CalculateCongestionWindow()") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true, -- "If true, cap client suggested initial RTT to 1s if it is longer than 1s.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer, -- false, -- "If true, close connection if writer is still blocked while OnCanWrite is called.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false, -- "If true, close connection on packet serialization failures.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false, -- "If true, set burst token to 2 in cwnd bootstrapping experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false, -- "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false, -- "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, -- "If true, default-enable 5RTO blachole detection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false, -- "If true, default on PTO which unifies TLP + RTO loss recovery.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true, -- "When true, defaults to BBR congestion control instead of Cubic.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false, -- "If true, use BBRv2 as the default congestion controller. Takes precedence over " -- "--quic_default_to_bbr.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false, -- "If true, disable blackhole detection on server side.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false, -- "If true, disable QUIC version h3-27.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false, -- "If true, disable QUIC version h3-29.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false, -- "If true, disable QUIC version Q043.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false, -- "If true, disable QUIC version Q046.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false, -- "If true, disable QUIC version Q050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false, -- "If true, disable QUIC version h3-T050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false, -- "If true, disable QUIC version h3-T051.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, -- "If true, discard INITIAL packet if the key has been dropped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false, -- "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false, -- "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false, -- "If ture, enable GFE-picked loss detection experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false, -- "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false, -- "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false, -- "If true, do not arm PTO for application data until handshake confirmed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false, -- "If true, convert bytes_left_for_batch_write_ to unsigned int.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false, -- "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If " -- "false, send the highest received stream ID, which actually should not be retried.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false, -- "If true, fix a potential out of order sending caused by handshake gets confirmed " -- "while the coalescer is not empty.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false, -- "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false, -- "If true, remove processed undecryptable packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true, -- "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false, -- "If true, QUIC connection will pass sent packet information to the debug visitor after " -- "a packet is recorded as sent in sent packet manager.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false, -- "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false, -- "If true, QuicListener::OnSocketIsWritable will always return false, which means there " -- "will never be a fake EPOLLOUT event in the next epoll iteration.") -- --QUICHE_FLAG(bool, -- quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded, -- false, "If true, neuter initial packet in the coalescer when discarding initial keys.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false, -- "If true, transport connection stats doesn't report duplicated experiments for same " -- "connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true, -- "If true, always send connection close for idle timeout if NSLC is received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false, -- "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will " -- "be the only place where TCS's uaid field is set.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true, -- "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false, -- "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false, -- "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip " -- "in TcpProxyHeaderProto.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true, -- "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping " -- "which is used to announce VIP in SHLO for proxied sessions. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false, -- "If true, record the received min_ack_delay in transport parameters to QUIC config.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true, -- "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are " -- "stored in stream_map_.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false, -- "If true, require handshake confirmation for QUIC connections, functionally disabling " -- "0-rtt handshakes.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false, -- "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false, -- "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. " -- "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn " -- "on this flag.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false, -- "When the STMP connection option is sent by the client, timestamps in the QUIC ACK " -- "frame are sent and processed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false, -- "If true, enable server push feature on QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false, -- "If true, set resumed_ssl_session if this is a 0-RTT connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false, -- "If true, while reading an IETF quic packet, start peer migration immediately when " -- "detecting the existence of any non-probing frame instead of at the end of the packet.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false, -- "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use " -- "QuicRstStreamErrorCodes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true, -- "A testonly reloadable flag that will always default to true.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false, -- "When true, set the initial congestion control window from connection options in " -- "QuicSentPacketManager rather than TcpCubicSenderBytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false, -- "If true, use header stage idle list for QUIC connections in GFE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false, -- "If true, QUIC will attempt to use the Leto key exchange service and only fall back to " -- "local key exchange if that fails.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false, -- "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure " -- "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the " -- "client to continue the handshake.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false, -- "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true, -- "If true, GFE informs backend that a client request is the first one on the connection " -- "via frontline header \"first_request=1\". Also, adjust initial cwnd based on " -- "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false, -- "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false, -- "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true, -- "If true, enables support for TLS resumption in QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true, -- "If true, support for IETF QUIC 0-rtt is enabled.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false, -- "If true, QUIC offload pacing when using USPS as egress method.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false, -- "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false, -- "If true, reject QUIC CHLO packets when dispatcher is asked to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false, -- "If true, QuicGsoBatchWriter will support release time if it is available and the " -- "process has the permission to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true, -- "A testonly restart flag that will always default to true.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_use_leto_for_quic_configs, false, -- "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false, -- "If true, create a shared pigeon socket for all quic to backend connections and switch " -- "to use it after successful handshake.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG( -- bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false, -- "If true, SPDY will discard all response body bytes when response code indicates no response " -- "body should exist. Previously, we only discard partial bytes on the first response processing " -- "and the rest of the response bytes would still be delivered even though the response code " -- "said there should not be any body associated with the response code.") -- --QUICHE_FLAG(bool, quic_allow_chlo_buffering, true, -- "If true, allows packets to be buffered in anticipation of a " -- "future CHLO, and allow CHLO packets to be buffered until next " -- "iteration of the event loop.") -- --QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC") -- --QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true, -- "If true, enforce that QUIC CHLOs fit in one packet") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000, -- "Maximum number of connections on the time-wait list. " -- "A negative value implies no configured limit.") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200, -- "Time period for which a given connection_id should live in " -- "the time-wait state.") -- --QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f, -- "Congestion window gain for QUIC BBR during PROBE_BW phase.") -- --QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024, -- "If buffered data in QUIC stream is less than this " -- "threshold, buffers all provided data or asks upper layer for more data") -- --QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024, -- "Max size of data slice in bytes for QUIC stream send buffer.") -- --QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2, -- "Number of packets that the pacing sender allows in bursts during " -- "pacing. This flag is ignored if a flow's estimated bandwidth is " -- "lower than 1200 kbps.") -- --QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f, -- "Congestion window fraction that the pacing sender allows in bursts " -- "during pacing.") -- --QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10, -- "Max time that QUIC can pace packets into the future in ms.") -- --QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f, -- "Smoothed RTT fraction that a connection can pace packets into the future.") -- --QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false, -- "If true, export number of packets written per write operation histogram.") -- --QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false, -- "If true, use predictable version negotiation versions.") -- --QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true, -- "If true, use random greased settings and frames.") -- --QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.") -- --QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false, -- "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses " -- "length-prefixed connection IDs.") -- --QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true, -- "If true, HTTP request header names sent from QuicSpdyClientBase(and " -- "descendents) will be automatically converted to lower case.") -- --QUICHE_FLAG(bool, quic_enable_http3_server_push, false, -- "If true, server push will be allowed in QUIC versions that use HTTP/3.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000, -- "The default minimum duration for BBRv2-native probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000, -- "The default upper bound of the random amount of BBRv2-native " -- "probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000, -- "The default period for entering PROBE_RTT, in milliseconds.") -- --QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02, -- "The default loss threshold for QUIC BBRv2, should be a value " -- "between 0 and 1.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8, -- "The default minimum number of loss marking events to exit STARTUP.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2, -- "The default minimum number of loss marking events to exit PROBE_UP phase.") -- --QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01, -- "The default fraction of unutilized headroom to try to leave in path " -- "upon high loss.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10, -- "The default initial value of the max ack height filter's window length.") -- --QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0, -- "If the bandwidth during ack aggregation is smaller than (estimated " -- "bandwidth * this flag), consider the current aggregation completed " -- "and starts a new one.") -- --QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5, -- "Anti-amplification factor. Before address validation, server will " -- "send no more than factor times bytes received.") -- --QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024, -- "The maximum amount of CRYPTO frame data that can be buffered.") -- --QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0, -- "If set to non-zero, the maximum number of consecutive pings that " -- "can be sent with aggressive initial retransmittable on wire timeout " -- "if there is no new data received. After which, the timeout will be " -- "exponentially back off until exceeds the default ping timeout.") -- --QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.") -- --QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2, -- "The divisor that controls how often MAX_STREAMS frame is sent.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --#endif -diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -index 7d2561469..dc6fe5429 100644 ---- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -@@ -8,10 +8,10 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value() -+#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetHttp2ReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -deleted file mode 100644 -index 3f595380b..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -+++ /dev/null -@@ -1,18 +0,0 @@ --#pragma once -- --#include "absl/base/optimization.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUIC_ALIGN_OF_IMPL alignof --#ifdef _MSC_VER --#define QUIC_ALIGNED_IMPL(X) __declspec(align(X)) --#else --#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X))) --#endif --#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED --#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -index 2a886a12c..27b977908 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -@@ -10,25 +10,7 @@ - - namespace quic { - --// static --bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out) { -- CBS tbs_certificate; -- if (!SeekToSubject(cert, &tbs_certificate)) { -- return false; -- } -- -- CBS subject; -- if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -- return false; -- } -- *subject_out = -- absl::string_view(reinterpret_cast(CBS_data(&subject)), CBS_len(&subject)); -- return true; --} -- --// static --bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) { -+bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) { - CBS der; - CBS_init(&der, reinterpret_cast(cert.data()), cert.size()); - CBS certificate; -@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c - return true; - } - -+// static -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert, -+ absl::string_view* subject_out) { -+ CBS tbs_certificate; -+ if (!seekToSubject(cert, &tbs_certificate)) { -+ return false; -+ } -+ -+ CBS subject; -+ if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -+ return false; -+ } -+ *subject_out = -+ absl::string_view(reinterpret_cast(CBS_data(&subject)), CBS_len(&subject)); -+ return true; -+} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -index 0c41b9dbc..29b882b7d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -@@ -6,18 +6,15 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - -+#include "absl/strings/string_view.h" - #include "openssl/base.h" --#include "quiche/common/platform/api/quiche_string_piece.h" - - namespace quic { - - class QuicCertUtilsImpl { - public: -- static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out); -- --private: -- static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out); - }; - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -deleted file mode 100644 -index aa9d6bc36..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/macros.h" -- --#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -index 91d52c44a..b2e396fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector ReadFileContentsImpl(const std::string& dirname) { - std::vector files; - depthFirstTraverseDirectory(dirname, files); -@@ -43,7 +44,8 @@ std::vector ReadFileContentsImpl(const std::string& dirname) { - } - - // Reads the contents of |filename| as a string into |contents|. --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents) { - #ifdef WIN32 - Envoy::Filesystem::InstanceImplWin32 fs; - #else -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -index 654c1ad18..25c31e9de 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -@@ -8,7 +8,7 @@ - - #include - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { - -@@ -16,6 +16,7 @@ namespace quic { - * Traverses the directory |dirname| and returns all of the files it contains. - * @param dirname full path without trailing '/'. - */ -+// NOLINTNEXTLINE(readability-identifier-naming)` - std::vector ReadFileContentsImpl(const std::string& dirname); - - /** -@@ -23,6 +24,7 @@ std::vector ReadFileContentsImpl(const std::string& dirname); - * @param filename the full path to the file. - * @param contents output location of the file content. - */ --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents); - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -index 872495f2d..d562bb1a4 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -@@ -15,16 +15,16 @@ - #define GetQuicFlagImpl(flag) (quiche::flag)->value() - - // |flag| is the global flag variable, which is a pointer to TypedFlag. --#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value) -+#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value) - - #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetQuicReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - --#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value) -+#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value) - - // Not wired into command-line parsing. - #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -index bcbafb566..75849611d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -@@ -19,7 +19,8 @@ - namespace quic { - - // static --bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - - return sni.find_last_of('.') != std::string::npos && -@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { - } - - // static --std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - std::string host = absl::AsciiStrToLower(hostname); - -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -index 2b7ed4357..67cd787d0 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -@@ -6,7 +6,7 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/platform/api/quic_export.h" - - namespace quic { -@@ -18,7 +18,8 @@ public: - // (2) check that the hostname contains valid characters only; and - // (3) contains at least one dot. - // NOTE(wub): Only (3) is implemented for now. -- static bool IsValidSNI(quiche::QuicheStringPiece sni); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool IsValidSNI(absl::string_view sni); - - // Normalize a hostname: - // (1) Canonicalize it, similar to what Chromium does in -@@ -27,7 +28,8 @@ public: - // (3) Remove the trailing '.'. - // WARNING: May mutate |hostname| in place. - // NOTE(wub): Only (2) and (3) are implemented for now. -- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string NormalizeHostname(absl::string_view hostname); - - private: - QuicHostnameUtilsImpl() = delete; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -deleted file mode 100644 -index b8b70a042..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -+++ /dev/null -@@ -1,13 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/attributes.h" -- --#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT --#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED --#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -index c2eb527d6..9e46c37df 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -@@ -10,7 +10,8 @@ - - namespace quic { - --quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) { - Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1); - ASSERT(slices.size() > index); - return {reinterpret_cast(slices[index].mem_), slices[index].len_}; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -index 1824fb8d1..ef40e6387 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -@@ -9,7 +9,7 @@ - #include "envoy/buffer/buffer.h" - - #include "absl/container/fixed_array.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/core/quic_types.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - -@@ -43,9 +43,13 @@ public: - } - - // QuicMemSliceSpan -- quiche::QuicheStringPiece GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ absl::string_view GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount total_length() { return buffer_->length(); }; -+ // NOLINTNEXTLINE(readability-identifier-naming) - size_t NumSlices() { return buffer_->getRawSlices().size(); } -+ // NOLINTNEXTLINE(readability-identifier-naming) - template QuicByteCount ConsumeAll(ConsumeFunction consume); - bool empty() const { return buffer_->length() == 0; } - -@@ -54,6 +58,7 @@ private: - }; - - template -+// NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) { - size_t saved_length = 0; - for (auto& slice : buffer_->getRawSlices()) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -similarity index 52% -rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -index aaebe5d5c..4b0201c35 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -@@ -6,12 +6,11 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "absl/memory/memory.h" -+#include "absl/strings/string_view.h" - --namespace quiche { -+namespace quic { - --template std::unique_ptr QuicheWrapUniqueImpl(T* ptr) { -- return absl::WrapUnique(ptr); --} -+// NOLINTNEXTLINE(readability-identifier-naming) -+template void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {} - --} // namespace quiche -+} // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -index 248cfc193..1e88abe46 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms - return false; - } - -+// NOLINTNEXTLINE(readability-identifier-naming) -+inline void SetGoogleSocketOptionsImpl(int /*fd*/) {} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -deleted file mode 100644 -index 7a23b53da..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --#include "absl/base/macros.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array) -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -deleted file mode 100644 -index f8b2b6c08..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -+++ /dev/null -@@ -1,17 +0,0 @@ --#pragma once -- --#include "absl/types/optional.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace quiche { -- --template using QuicheOptionalImpl = absl::optional; -- --#define QUICHE_NULLOPT_IMPL absl::nullopt -- --} // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -index 3a6d1a393..7b87c1cd6 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -@@ -2,7 +2,6 @@ - - #include "common/common/base64.h" - --#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h" - #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h" - #include "extensions/quic_listeners/quiche/platform/string_utils.h" - -@@ -13,6 +12,7 @@ - #include "absl/strings/str_cat.h" - #include "absl/strings/str_format.h" - #include "absl/strings/str_split.h" -+#include "absl/types/optional.h" - - // NOLINT(namespace-envoy) - -@@ -25,58 +25,16 @@ namespace quiche { - class QuicheTextUtilsImpl { - public: - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) { -- return absl::StartsWith(data, prefix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWith(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWithIgnoreCase(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); } -+ static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) { -+ static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { - *data = absl::StripAsciiWhitespace(*data); - } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) { - *output = -@@ -84,27 +42,28 @@ public: - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static QuicheOptionalImpl Base64Decode(QuicheStringPieceImpl input) { -+ static absl::optional Base64Decode(absl::string_view input) { - return Envoy::Base64::decodeWithoutPadding(input); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDump(QuicheStringPieceImpl binary_data) { -- return quiche::HexDump(binary_data); -- } -+ static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -+ -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool ContainsUpperCase(QuicheStringPieceImpl data) { -+ static bool ContainsUpperCase(absl::string_view data) { - return std::any_of(data.begin(), data.end(), absl::ascii_isupper); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool IsAllDigits(QuicheStringPieceImpl data) { -+ static bool IsAllDigits(absl::string_view data) { - return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::vector Split(QuicheStringPieceImpl data, char delim) { -+ static std::vector Split(absl::string_view data, char delim) { - return absl::StrSplit(data, delim); - } - }; -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -index 3260eafee..5387e0598 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -@@ -9,7 +9,7 @@ - namespace quiche { - - namespace { --QuicheOptional quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, -+absl::optional quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, - int minute, int second) { - const absl::CivilSecond civil_time(year, month, day, hour, minute, second); - if (second != 60 && (civil_time.year() != year || civil_time.month() != month || -@@ -24,7 +24,7 @@ QuicheOptional quicheUtcDateTimeToUnixSecondsInner(int year, int month, - } // namespace - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second) { - // Handle leap seconds without letting any other irregularities happen. - if (second == 60) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -index a1b70b70a..5e2ef7956 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -@@ -10,12 +10,12 @@ - - #include "absl/time/civil_time.h" - #include "absl/time/time.h" --#include "quiche/common/platform/api/quiche_optional.h" -+#include "absl/types/optional.h" - - namespace quiche { - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second); - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -deleted file mode 100644 -index 737b81ee2..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -+++ /dev/null -@@ -1,29 +0,0 @@ --#pragma once -- --#include -- --#include "envoy/common/platform.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace spdy { -- --inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); } -- --inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); } -- --// TODO: implement --inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; } -- --inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); } -- --inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); } -- --// TODO: implement --inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; } -- --} // namespace spdy -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -index a3cbd680f..833562fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -@@ -8,9 +8,9 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value() -+#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - --#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value() -+#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - - #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -index 41fa3cad8..4b01b2dbd 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) { - inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); } - - struct SpdyStringPieceCaseHashImpl { -- size_t operator()(quiche::QuicheStringPiece data) const { -+ size_t operator()(absl::string_view data) const { - std::string lower = absl::AsciiStrToLower(data); - return absl::Hash()(lower); - } -diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -index 3bd0bc295..5ac5738c4 100644 ---- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -+++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock; - namespace quic { - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static - std::string -+// NOLINTNEXTLINE(readability-identifier-naming) - SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static --std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/, -- quiche::QuicheStringPiece /*authority*/, -- quiche::QuicheStringPiece /*path*/) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/, -+ absl::string_view /*authority*/, -+ absl::string_view /*path*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -index e2d90d916..8fa7d9fe9 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -@@ -49,9 +49,9 @@ public: - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false, - supported_versions, dispatcher, std::move(connection_socket)) { -- SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique(quic::Perspective::IS_CLIENT)); -+ SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&)); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -index 98359c618..f3b02f4cc 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -@@ -48,11 +48,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) { - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) { - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string request1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -index cbf66f511..8a493a8e8 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -@@ -25,7 +25,7 @@ namespace Quic { - class TestGetProofCallback : public quic::ProofSource::Callback { - public: - TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config, -- quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash, -+ quic::QuicTransportVersion& version, absl::string_view chlo_hash, - Network::FilterChain& filter_chain) - : called_(called), should_succeed_(should_succeed), server_config_(server_config), - version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) { -@@ -100,7 +100,7 @@ private: - bool should_succeed_; - const std::string& server_config_; - const quic::QuicTransportVersion& version_; -- quiche::QuicheStringPiece chlo_hash_; -+ absl::string_view chlo_hash_; - Network::FilterChain& expected_filter_chain_; - NiceMock store_; - Event::GlobalTimeSystem time_system_; -@@ -178,7 +178,7 @@ protected: - quic::QuicSocketAddress server_address_; - quic::QuicSocketAddress client_address_; - quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash_{"aaaaa"}; -+ absl::string_view chlo_hash_{"aaaaa"}; - std::string server_config_{"Server Config"}; - std::string expected_certs_{quic::test::kTestCertificateChainPem}; - std::string pkey_{quic::test::kTestCertificatePrivateKeyPem}; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -index 4a1dfe144..9cdc169cd 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) { - configCertVerificationDetails(true); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -index 05307c6b9..4fc376857 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -@@ -61,6 +61,7 @@ public: - const quic::ParsedQuicVersionVector& supported_versions, - Network::Socket& listen_socket) - : EnvoyQuicServerConnection(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345), - quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345), - helper, alarm_factory, &writer, /*owns_writer=*/false, - supported_versions, listen_socket) {} -@@ -201,10 +202,10 @@ public: - crypto_stream_ = test_crypto_stream; - } - quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream); -- quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - quic_connection_->SetEncrypter( - quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique(quic::Perspective::IS_SERVER)); -+ quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - bool installReadFilter() { -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -index c2fd31c6f..f602e2c9a 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -@@ -51,6 +51,7 @@ public: - POOL_GAUGE(listener_config_.listenerScope()), - POOL_HISTOGRAM(listener_config_.listenerScope()))}), - quic_connection_(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123), - quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345), - connection_helper_, alarm_factory_, &writer_, - /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_), -@@ -66,11 +67,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -110,7 +111,7 @@ public: - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, body); - } - return data; -@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - - // Make the stream blocked by congestion control. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false); - - // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously -@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string response1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD -index 420e812b8..7dbb08d82 100644 ---- a/test/extensions/quic_listeners/quiche/platform/BUILD -+++ b/test/extensions/quic_listeners/quiche/platform/BUILD -@@ -9,16 +9,6 @@ licenses(["notice"]) # Apache 2 - - envoy_package() - --envoy_cc_test( -- name = "quiche_platform_test", -- srcs = ["quiche_platform_test.cc"], -- external_deps = ["quiche_common_platform"], -- deps = [ -- "@com_googlesource_quiche//:quiche_common_platform", -- "@com_googlesource_quiche//:quiche_common_platform_endian", -- ], --) -- - envoy_cc_test( - name = "http2_platform_test", - srcs = ["http2_platform_test.cc"], -@@ -63,7 +53,6 @@ envoy_cc_test( - "@com_googlesource_quiche//:quic_platform_mem_slice_span", - "@com_googlesource_quiche//:quic_platform_mem_slice_storage", - "@com_googlesource_quiche//:quic_platform_mock_log", -- "@com_googlesource_quiche//:quic_platform_port_utils", - "@com_googlesource_quiche//:quic_platform_sleep", - "@com_googlesource_quiche//:quic_platform_system_event_loop", - "@com_googlesource_quiche//:quic_platform_test", -@@ -150,17 +139,6 @@ envoy_cc_test_library( - deps = ["@com_googlesource_quiche//:quic_platform_base"], - ) - --envoy_cc_test_library( -- name = "quic_platform_port_utils_impl_lib", -- srcs = ["quic_port_utils_impl.cc"], -- hdrs = ["quic_port_utils_impl.h"], -- tags = ["nofips"], -- deps = [ -- "//source/common/network:utility_lib", -- "//test/test_common:environment_lib", -- ], --) -- - envoy_cc_test_library( - name = "quic_platform_test_mem_slice_vector_impl_lib", - hdrs = ["quic_test_mem_slice_vector_impl.h"], -diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -index 069a79eab..35aee5d27 100644 ---- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) { - HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)"; - } - --TEST(Http2PlatformTest, Http2StringPiece) { -- std::string s = "bar"; -- quiche::QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- - TEST(Http2PlatformTest, Http2Macro) { - EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), ""); - EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), ""); - } - - TEST(Http2PlatformTest, Http2Flags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) { - for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"some", "invalid", "values", ""}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - } -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -index 68141aa94..902ad1a9e 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -@@ -30,7 +30,6 @@ - #include "gtest/gtest.h" - #include "quiche/common/platform/api/quiche_string_piece.h" - #include "quiche/epoll_server/fake_simple_epoll_server.h" --#include "quiche/quic/platform/api/quic_aligned.h" - #include "quiche/quic/platform/api/quic_bug_tracker.h" - #include "quiche/quic/platform/api/quic_cert_utils.h" - #include "quiche/quic/platform/api/quic_client_stats.h" -@@ -42,7 +41,6 @@ - #include "quiche/quic/platform/api/quic_flags.h" - #include "quiche/quic/platform/api/quic_hostname_utils.h" - #include "quiche/quic/platform/api/quic_logging.h" --#include "quiche/quic/platform/api/quic_macros.h" - #include "quiche/quic/platform/api/quic_map_util.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - #include "quiche/quic/platform/api/quic_mem_slice_span.h" -@@ -50,7 +48,6 @@ - #include "quiche/quic/platform/api/quic_mock_log.h" - #include "quiche/quic/platform/api/quic_mutex.h" - #include "quiche/quic/platform/api/quic_pcc_sender.h" --#include "quiche/quic/platform/api/quic_port_utils.h" - #include "quiche/quic/platform/api/quic_ptr_util.h" - #include "quiche/quic/platform/api/quic_server_stats.h" - #include "quiche/quic/platform/api/quic_sleep.h" -@@ -92,8 +89,6 @@ protected: - const int verbosity_log_threshold_; - }; - --TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); } -- - enum class TestEnum { ZERO = 0, ONE, TWO, COUNT }; - - TEST_F(QuicPlatformTest, QuicBugTracker) { -@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) { - unsigned char* der = nullptr; - int len = i2d_X509(x509_cert.get(), &der); - ASSERT_GT(len, 0); -- quiche::QuicheStringPiece out; -+ absl::string_view out; - QuicCertUtils::ExtractSubjectNameFromDERCert( -- quiche::QuicheStringPiece(reinterpret_cast(der), len), &out); -+ absl::string_view(reinterpret_cast(der), len), &out); - EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13" - "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16" - "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r" -@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) { - } - - TEST_F(QuicPlatformTest, QuicFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true)); -@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) { - SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); - -- flag_registry.ResetFlags(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -- flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false") -- ->SetValueFromString("true"); -- flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0"); -- flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false") -+ ->setValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true") -+ ->setValueFromString("0"); -+ flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100"); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) { - EXPECT_EQ(data, output); - } - --TEST_F(QuicPlatformTest, PickUnsedPort) { -- int port = QuicPickServerPortForTestsOrDie(); -- std::vector supported_versions = -- Envoy::TestEnvironment::getIpVersionsForTest(); -- for (auto ip_version : supported_versions) { -- Envoy::Network::Address::InstanceConstSharedPtr addr = -- Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version); -- Envoy::Network::Address::InstanceConstSharedPtr addr_with_port = -- Envoy::Network::Utility::getAddressWithPort(*addr, port); -- Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port); -- // binding of given port should success. -- EXPECT_EQ(0, sock.bind(addr_with_port).rc_); -- } --} -- --TEST_F(QuicPlatformTest, FailToPickUnsedPort) { -- Envoy::Api::MockOsSysCalls os_sys_calls; -- Envoy::TestThreadsafeSingletonInjector os_calls(&os_sys_calls); -- // Actually create sockets. -- EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) { -- os_fd_t fd = ::socket(domain, type, protocol); -- return Envoy::Api::SysCallSocketResult{fd, errno}; -- }); -- // Fail bind call's to mimic port exhaustion. -- EXPECT_CALL(os_sys_calls, bind(_, _, _)) -- .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE})); -- EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test."); --} -- - TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) { - QuicStreamBufferAllocator allocator; - Envoy::Stats::TestUtil::MemoryTest memory_test; -@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) { - QuicSystemEventLoop("dummy"); - } - --QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; } -- --TEST_F(QuicPlatformTest, TestQuicMacros) { -- // Just make sure it compiles. -- EXPECT_FALSE(dummyTestFunction()); -- int a QUIC_UNUSED; --} -- - TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) { - std::string str(512, 'b'); - // Fragment needs to out-live buffer. -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -index 556f6cd3e..9eaf8532a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -@@ -19,7 +19,7 @@ - namespace quic { - namespace { - --void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) { -+void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) { - const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (output_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin - } - } // namespace - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) { -- QuicRecordTestOutputToFile(filename.data(), data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) { -+ quicRecordTestOutputToFile(filename.data(), data); - } - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) { - const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (read_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat - return true; - } - --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) { - const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info(); - - std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone()); -@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr - std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(), - test_info->test_case_name(), identifier.data(), timestamp); - -- QuicRecordTestOutputToFile(filename, data); -+ quicRecordTestOutputToFile(filename, data); - } - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -index a1c6c7305..fcf0c47b3 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -@@ -6,14 +6,16 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data); - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data); - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data); -- --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data); - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -deleted file mode 100644 -index a733894b5..000000000 ---- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -+++ /dev/null -@@ -1,39 +0,0 @@ --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "gtest/gtest.h" --#include "quiche/common/platform/api/quiche_arraysize.h" --#include "quiche/common/platform/api/quiche_endian.h" --#include "quiche/common/platform/api/quiche_optional.h" --#include "quiche/common/platform/api/quiche_ptr_util.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -- --namespace quiche { -- --TEST(QuichePlatformTest, Arraysize) { -- int array[] = {0, 1, 2, 3, 4}; -- EXPECT_EQ(5, QUICHE_ARRAYSIZE(array)); --} -- --TEST(QuichePlatformTest, StringPiece) { -- std::string s = "bar"; -- QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- --TEST(QuichePlatformTest, WrapUnique) { -- auto p = QuicheWrapUnique(new int(6)); -- EXPECT_EQ(6, *p); --} -- --TEST(QuichePlatformTest, TestQuicheOptional) { -- QuicheOptional maybe_a; -- EXPECT_FALSE(maybe_a.has_value()); -- maybe_a = 1; -- EXPECT_EQ(1, *maybe_a); --} -- --} // namespace quiche -diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -index 56453e232..eeae58c0a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -@@ -8,7 +8,6 @@ - #include "gtest/gtest.h" - #include "quiche/spdy/platform/api/spdy_bug_tracker.h" - #include "quiche/spdy/platform/api/spdy_containers.h" --#include "quiche/spdy/platform/api/spdy_endianness_util.h" - #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h" - #include "quiche/spdy/platform/api/spdy_flags.h" - #include "quiche/spdy/platform/api/spdy_logging.h" -@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) { - EXPECT_EQ(0, hset.count("qux")); - } - --TEST(SpdyPlatformTest, SpdyEndianness) { -- EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234))); -- EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678))); --} -- - TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) { - std::string s = "foo"; - // Stubbed out to always return 0. -@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) { - } - - TEST(SpdyPlatformTest, SpdyFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false") -- ->SetValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false") -+ ->setValueFromString("true"); - EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.ResetFlags(); -- flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false") -- ->SetValueFromString("yes"); -+ flag_registry.resetFlags(); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false") -+ ->setValueFromString("yes"); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false)); - } -diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h -index a249b4314..bbedfd6c7 100644 ---- a/test/extensions/quic_listeners/quiche/test_proof_source.h -+++ b/test/extensions/quic_listeners/quiche/test_proof_source.h -@@ -36,7 +36,7 @@ protected: - void signPayload(const quic::QuicSocketAddress& /*server_address*/, - const quic::QuicSocketAddress& /*client_address*/, - const std::string& /*hostname*/, uint16_t /*signature_algorithm*/, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) override { - callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"), - std::make_unique(filter_chain_)); -diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h -index 102f7608e..7f0ea78e8 100644 ---- a/test/extensions/quic_listeners/quiche/test_utils.h -+++ b/test/extensions/quic_listeners/quiche/test_utils.h -@@ -46,7 +46,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional level)); -+ absl::optional level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { -@@ -90,7 +90,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional level)); -+ absl::optional level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { --- -2.29.2 - diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch deleted file mode 100644 index 370682efaa..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Thu, 7 Jan 2021 11:09:18 +0000 -Subject: [PATCH] Add upb patch to make it compile under GCC10 - ---- - bazel/repositories.bzl | 5 +++- - bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+), 1 deletion(-) - create mode 100644 bazel/upb2.patch - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index 64d61ea49..c6cadc9df 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -811,7 +811,10 @@ def _com_github_grpc_grpc(): - def _upb(): - _repository_impl( - name = "upb", -- patches = ["@envoy//bazel:upb.patch"], -+ patches = [ -+ "@envoy//bazel:upb.patch", -+ "@envoy//bazel:upb2.patch", -+ ], - patch_args = ["-p1"], - ) - -diff --git a/bazel/upb2.patch b/bazel/upb2.patch -new file mode 100644 -index 000000000..6e436c61b ---- /dev/null -+++ b/bazel/upb2.patch -@@ -0,0 +1,55 @@ -+From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001 -+From: Joshua Haberman -+Date: Tue, 7 Apr 2020 15:22:11 -0700 -+Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy(). -+ (#268) -+ -+Added tests for all cases. Also removed ellipses from truncated -+messages, they were more trouble than they are worth. -+--- -+ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++ -+ upb/upb.c | 17 +++-------------- -+ 2 files changed, 36 insertions(+), 14 deletions(-) -+ -+diff --git a/upb/upb.c b/upb/upb.c -+index cb2cdfd9d..258192d79 100644 -+--- a/upb/upb.c -++++ b/upb/upb.c -+@@ -11,17 +11,6 @@ -+ -+ #include "upb/port_def.inc" -+ -+-/* Guarantee null-termination and provide ellipsis truncation. -+- * It may be tempting to "optimize" this by initializing these final -+- * four bytes up-front and then being careful never to overwrite them, -+- * this is safer and simpler. */ -+-static void nullz(upb_status *status) { -+- const char *ellipsis = "..."; -+- size_t len = strlen(ellipsis); -+- UPB_ASSERT(sizeof(status->msg) > len); -+- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len); -+-} -+- -+ /* upb_status *****************************************************************/ -+ -+ void upb_status_clear(upb_status *status) { -+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; } -+ void upb_status_seterrmsg(upb_status *status, const char *msg) { -+ if (!status) return; -+ status->ok = false; -+- strncpy(status->msg, msg, sizeof(status->msg)); -+- nullz(status); -++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) { -+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) { -+ if (!status) return; -+ status->ok = false; -+ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args); -+- nullz(status); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ /* upb_alloc ******************************************************************/ --- -2.29.2 - diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix index c81d79dbb2..0c5038898e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -1,6 +1,8 @@ { lib +, bazel_4 , buildBazelPackage , fetchFromGitHub +, fetchpatch , stdenv , cmake , gn @@ -8,6 +10,7 @@ , jdk , ninja , python3 +, linuxHeaders , nixosTests }: @@ -17,23 +20,24 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.19.1"; - commit = "a2a1e3eed4214a38608ec223859fcfa8fb679b14"; + version = "1.21.1"; + rev = "af50070ee60866874b0a9383daf9364e884ded22"; }; in buildBazelPackage rec { pname = "envoy"; - version = srcVer.version; + inherit (srcVer) version; + bazel = bazel_4; src = fetchFromGitHub { owner = "envoyproxy"; repo = "envoy"; - rev = srcVer.commit; - hash = "sha256:1v1hv4blrppnhllsxd9d3k2wl6nhd59r4ydljy389na3bb41jwf9"; + inherit (srcVer) rev ; + hash = "sha256:11mm72zmb479ss585jzqzhklyyqmdadnvr91ghzvjxc0j2a1hrr4"; extraPostFetch = '' chmod -R +w $out rm $out/.bazelversion - echo ${srcVer.commit} > $out/SOURCE_VERSION + echo ${srcVer.rev} > $out/SOURCE_VERSION sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl ''; }; @@ -48,6 +52,14 @@ buildBazelPackage rec { --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"' ''; + patches = [ + # make linux/tcp.h relative. drop when upgrading to >1.21 + (fetchpatch { + url = "https://github.com/envoyproxy/envoy/commit/68448aae7a78a3123097b6ea96016b270457e7b8.patch"; + sha256 = "123kv3x37p8fgfp29jhw5xg5js5q5ipibs8hsm7gzfd5bcllnpfh"; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -57,8 +69,12 @@ buildBazelPackage rec { ninja ]; + buildInputs = [ + linuxHeaders + ]; + fetchAttrs = { - sha256 = "sha256:0vnl0gq6nhvyzz39jg1bvvna0xyhxalg71bp1jbxib7ql026004r"; + sha256 = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; dontUseCmakeConfigure = true; dontUseGnConfigure = true; preInstall = '' @@ -84,7 +100,7 @@ buildBazelPackage rec { dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' - sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl # Add paths to Nix store back. sed -i \ diff --git a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix index cbf2fe1943..8a5580d5d0 100644 --- a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix @@ -4,6 +4,7 @@ , envoy , zip , nixosTests +, pomerium-cli }: let @@ -11,18 +12,17 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.15.7"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256:0adlk4ylny1z43x1dw3ny0s1932vhb61hpf5wdz4r65y8k9qyfgr"; + hash = "sha256:1hv76i6k9f0kp527nxlxqhklsvkh2cmfnqlszmlk2hxij31qnf8q"; }; - vendorSha256 = "sha256:1fszfbra84pcs8v1h2kf7iy603vf9v2ysg6il76aqmqrxmb1p7nv"; + vendorSha256 = "sha256:1cq4m5a7z64yg3v1c68d15ilw78il6p53vaqzxgn338zjggr3kig"; subPackages = [ "cmd/pomerium" - "cmd/pomerium-cli" ]; ldflags = let @@ -74,11 +74,11 @@ buildGoModule rec { installPhase = '' install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium - install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli ''; passthru.tests = { inherit (nixosTests) pomerium; + inherit pomerium-cli; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index a7c20d1120..29b33cd661 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-z1Vt6rTpQ9sSwT+hr4wGZmZl55MyDx1AIDqSWmCXbMc="; + sha256 = "sha256-8oUPqtoxdJ768CmDNBicBGCyejt2v9GIahVRL6pYDJ4="; rev = "v${version}"; }; - vendorSha256 = "sha256-MHcV6n6uZsjC85vQVl+o6JD+psvE2xuPr//3RueT8V0="; + vendorSha256 = "sha256-Dr5qCLVsv22BcISo2OyB+VEDncPwpcp323w9IfDTQv0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 799b812047..99a0187e1d 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.596"; + version = "0.20.663"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "wIJSqsIb3/SOicjLgnv0Lt3Wv1qKPHslRcDlZCvckUs="; + sha256 = "ZlKjuY3zHciImprDpaiBMnTJZtiegTpjhBcXe4LuYrQ="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 9af3437149..1ae541cdf8 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "1ap4jb43gvy7caa8lg2hg811q0n5c2gqbmcjl4126wz44hb7waa1"; + sha256 = "sha256-3vrcaBsarJNECwfzUOrUnjD555E2dgbFiiEJR5bN3qM="; }; - buildInputs = [ dovecot xapian icu64 ]; + buildInputs = [ dovecot xapian icu64 sqlite ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index cde926de26..c2cb3123b7 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix @@ -14,21 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ="; nativeBuildInputs = with pkgs; [ - clang - llvmPackages.libclang + rustPlatform.bindgenHook ]; buildInputs = with pkgs; [ pkg-config - clangStdenv - llvmPackages.libclang.lib rocksdb ]; - preBuild = with pkgs; '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - ''; - cargoBuildFlags = "--bin conduit"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 98a00da5ba..578c5ec722 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -11,19 +11,13 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.52.0"; + version = "1.53.0"; src = fetchPypi { inherit pname version; - sha256 = "091z3rwd10n59andfy1pfjrf6q3n3yrjqrws13lqc02w23aaxzin"; + sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3"; }; - # frozendict version constraint is to avoid a debian issue we don't have - postPatch = '' - substituteInPlace synapse/python_dependencies.py \ - --replace '"frozendict' '"frozendict", #' - ''; - buildInputs = [ openssl ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index a3f151a19a..e05d77d8a1 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-02-18T01-50-10Z"; + version = "2022-02-24T22-12-01Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-4SUmnUrO89hRcr2w1v6qZiY3swlIZsPgmCHa+q+iFK0="; + sha256 = "sha256-7bnT+rxQw2h1wCkXjsYm8ystU9F4EUL0KASkJmqLgXQ="; }; - vendorSha256 = "sha256-5OJntT5ed4pmugB1yw0fa906McREzv5aPuC8vBVx5o0="; + vendorSha256 = "sha256-fYpnYMt6VrC2eem8XvK8oAR1B0rQ4DV6ZWo0cLNCjCs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index dc1b0d6bd6..0a3e9af510 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.34.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; + sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; }; - vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; + vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; postConfigure = '' export CGO_ENABLED=0 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 7bb433f83e..7cd209f95e 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 @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.12.11"; + version = "0.13.1"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-hxnd9zuDq3CfdvriU1P5C9oM2x/sLqLQZPDNolpz5IQ="; + sha256 = "sha256-oWZ+o19bNR7/QuYTquRa3l7GfRLMEdyPtBUOwb2p3jA="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index fdb6ea0efa..bc669bbf50 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.4.1"; + version = "8.4.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-RVEgqFEwvXTHE8Kvc1q+0o+V3mEHtURQR/7x3Qcmtpg="; + sha256 = "sha256-+d4pcuNLbM2PY1rFpnIjoakpr63kMqI/SjpTRZecRXw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-RTupkQ9LlppJeyfmgGMztMW2m+sJXkJuDAdtpcyRGe0="; + sha256 = "sha256-l3GPSUci812KbHKMXHtS4OlvYyuKlBOeQCLtLvvkhzI="; }; vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; 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 80bb74c4c2..de64666ec7 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 @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-M2Iy4FrdNw2Qyep8hHswzUEI7HSvVCuZO8wnJ398MfU="; + sha256 = "sha256-tUmRWXdPu3nGj+dUBNvF7cRayMn8vCyA94vyUmQrfRk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 27eb3721c9..8f9e5884ae 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1cp7c1w237r271m8b1y8pj5jy7j2iadp4vbislxfyp4kga9i4dcc"; + sha256 = "15w2ijz621caink2imlp1666j0ih5pmlj62cbzggyb34ncl37ifn"; }; - vendorSha256 = "1cslg29l9mmyhpdz14ca9m18iaz4hhznplz8fmi3wa3l8r7ih751"; + vendorSha256 = "00i9znb1pk5jpmyhxfg9zbw935fk3c1r0qrgf868xlcf9p8x2rrz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix index c5ba909c41..31525464c0 100644 --- a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix @@ -15,13 +15,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-11-13"; + version = "unstable-2021-12-05"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "bed239c90a3b5fef5c6bf4559a774b9d09987c30"; - sha256 = "2gnW6dPsKMfoZnjs9F3opxRCeym+P43ZJOmGM44twfw="; + rev = "ac73036857cc1ca83df072dd94bf28eb9d0ed8b0"; + sha256 = "Oqjt0z4grt+hdQ4t7KQSwkkCeRGoFFedJsTpMHwMm34="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix b/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix index 16e15a8dd2..65c6d8ae77 100644 --- a/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-81Ok/0cDkFqKEAwWtpxM3InMfu0R9rZJzQ41AhWuVuo="; + sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec="; }; - vendorSha256 = "sha256-9FMxj3AkbKyUMZWj1S0myoKem4mupOHPIfxNHjYk8mU="; + vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix index 7788e3ff38..d9f5978f26 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.24"; - sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; + version = "3.0.26"; + sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; generation = "3_0"; }) diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix index bcdfc8793d..fc839fa8c3 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.10"; - sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; + version = "3.11.12"; + sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; generation = "3_11"; }) diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix index 6e2a55b4e9..ca11b838e3 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ - $out/javadoc \ $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then diff --git a/third_party/nixpkgs/pkgs/servers/peertube/default.nix b/third_party/nixpkgs/pkgs/servers/peertube/default.nix index 67f7fd7660..9961e9d581 100644 --- a/third_party/nixpkgs/pkgs/servers/peertube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/peertube/default.nix @@ -1,34 +1,33 @@ { lib, stdenv, callPackage, fetchurl, fetchFromGitHub, buildGoModule, fetchYarnDeps, nixosTests -, esbuild, fixup_yarn_lock, jq, nodejs, yarn -, nodePackages, youtube-dl +, fixup_yarn_lock, jq, nodejs, yarn }: let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "3.4.1"; + version = "4.1.0"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "0l1ibqmliy4aq60a16v383v4ijv1c9sf2a35k9q365mkl42jbzx1"; + sha256 = "sha256-gW/dzWns6wK3zzNjbW19HrV2jqzjdXR5uMMNXL4Xfdw="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "0zyxf1km79w6329jay4bcpw5bgvhnvmvl11r9hka5c6s46d3ms7n"; + sha256 = "sha256-L1Nr6sGjYVm42OyeFOQeQ6WEXjmNkngWilBtfQJ6bPE="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${source}/server/tools/yarn.lock"; - sha256 = "12xmwc8lnalcpx3nww457avn5zw04ly4pp4kjxkvhsqs69arfl2m"; + sha256 = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${source}/client/yarn.lock"; - sha256 = "1glnip6mpizif36vil61sw8i8lnn0jg5hrqgqw6k4cc7hkd2qkpc"; + sha256 = "sha256-wniMvtz7i3I4pn9xyzfNi1k7gQuzDl1GmEO8LqPBMKg="; }; bcrypt_version = "5.0.1"; @@ -37,33 +36,12 @@ let sha256 = "3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; }; - wrtc_version = "0.4.7"; - wrtc_lib = fetchurl { - url = "https://node-webrtc.s3.amazonaws.com/wrtc/v${wrtc_version}/Release/${arch}.tar.gz"; - sha256 = "1zd3jlwq3lc2vhmr3bs1h6mrzyswdp3y20vb4d9s67ir9q7jn1zf"; - }; - - esbuild_locked = buildGoModule rec { - pname = "esbuild"; - version = "0.12.17"; - - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "16xxscha2y69mgm20rpjdxykyqiy0qy8gayh8046q6m0sf6834y1"; - }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; - }; - in stdenv.mkDerivation rec { inherit version; pname = "peertube"; src = source; - nativeBuildInputs = [ esbuild fixup_yarn_lock jq nodejs yarn ]; - - buildInputs = [ nodePackages.node-gyp-build youtube-dl ]; + nativeBuildInputs = [ fixup_yarn_lock jq nodejs yarn ]; buildPhase = '' # Build node modules @@ -93,31 +71,16 @@ in stdenv.mkDerivation rec { fi mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcrypt_lib} - # Fix youtube-dl node module - cd ~/node_modules/youtube-dl - mkdir ./bin - ln -s ${youtube-dl}/bin/youtube-dl ./bin/youtube-dl - cat > ./bin/details <=8.3.0" \ + --replace "psycopg2==2.8.*" "psycopg2>=2.8.0" \ + --replace "cryptography==3.*" "cryptography>=3.0" \ + --replace "requests==2.25.*" "requests>=2.25.0" + # don't use Server Mode (can be overridden later) + substituteInPlace pkg/pip/setup_pip.py \ + --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ + --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + ''; + + preBuild = '' + # Adapted from pkg/pip/build.sh + echo Creating required directories... + mkdir -p pip-build/pgadmin4/docs + + # build the documentation + cd docs/en_US + ${sphinx}/bin/sphinx-build -W -b html -d _build/doctrees . _build/html + + # Build the clean tree + cd ../../web + cp -r * ../pip-build/pgadmin4 + cd ../docs + cp -r * ../pip-build/pgadmin4/docs + for DIR in `ls -d ??_??/` + do + if [ -d ''${DIR}_build/html ]; then + mkdir -p ../pip-build/pgadmin4/docs/''${DIR}_build + cp -Rv ''${DIR}_build/html ../pip-build/pgadmin4/docs/''${DIR}_build + fi + done + cd ../ + + cp -r ${yarnDeps}/* pip-build/pgadmin4 + + echo Creating distro config... + echo HELP_PATH = \'../../docs/en_US/_build/html/\' > pip-build/pgadmin4/config_distro.py + echo MINIFY_HTML = False >> pip-build/pgadmin4/config_distro.py + + echo Creating manifest... + echo recursive-include pgadmin4 \* > pip-build/MANIFEST.in + + echo Building wheel... + cd pip-build + # copy non-standard setup.py to local directory + # so setuptools-build-hook can call it + cp -v ../pkg/pip/setup_pip.py setup.py + ''; + + nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + buildInputs = [ + zlib + python3.pkgs.wheel + ]; + + # tests need an own data, log directory + # and a working and correctly setup postgres database + # checks will be run through nixos/tests + doCheck = false; + + propagatedBuildInputs = with python3.pkgs; [ + flask + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + speaklater3 + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + ]; + + passthru = { + tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; }; + }; + + meta = with lib; { + description = "Administration and development platform for PostgreSQL"; + homepage = "https://www.pgadmin.org/"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch new file mode 100644 index 0000000000..0b1cb8f95e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch @@ -0,0 +1,65 @@ +From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= +Date: Wed, 23 Feb 2022 14:40:11 +0100 +Subject: [PATCH] Expose setup.py as pgadmin4-setup + +--- + pkg/pip/setup_pip.py | 5 ++++- + web/setup.py | 14 ++++++++------ + 2 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py +index 5592d1b04..131eaa1ed 100644 +--- a/pkg/pip/setup_pip.py ++++ b/pkg/pip/setup_pip.py +@@ -95,7 +95,10 @@ setup( + }, + + entry_points={ +- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'], ++ 'console_scripts': [ ++ 'pgadmin4=pgadmin4.pgAdmin4:main', ++ 'pgadmin4-setup=pgadmin4.setup:main' ++ ], + }, + + ) +diff --git a/web/setup.py b/web/setup.py +index 5f4257e86..df970f049 100644 +--- a/web/setup.py ++++ b/web/setup.py +@@ -32,6 +32,10 @@ from pgadmin import create_app + from pgadmin.utils import clear_database_servers, dump_database_servers,\ + load_database_servers + ++# Configuration settings ++import config ++from pgadmin.model import SCHEMA_VERSION ++from pgadmin.setup import db_upgrade, create_app_data_directory + + def dump_servers(args): + """Dump the server groups and servers. +@@ -139,12 +143,7 @@ def clear_servers(): + clear_database_servers(load_user, True) + + +-if __name__ == '__main__': +- # Configuration settings +- import config +- from pgadmin.model import SCHEMA_VERSION +- from pgadmin.setup import db_upgrade, create_app_data_directory +- ++def main(): + parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB') + + exp_group = parser.add_argument_group('Dump server config') +@@ -194,3 +193,6 @@ if __name__ == '__main__': + print(str(e)) + else: + setup_db() ++ ++if __name__ == '__main__': ++ main() +-- +2.35.1 + diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json new file mode 100644 index 0000000000..aa28f05da4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json @@ -0,0 +1,192 @@ +{ + "//": [ + "IMPORTANT:", + "If runtime or build time dependencies are changed in this file, the ", + "committer *must* ensure the DEB and RPM package maintainers are informed ", + "as soon as possible." + ], + "license": "PostgreSQL", + "devDependencies": { + "@babel/core": "^7.10.2", + "@babel/eslint-parser": "^7.12.13", + "@babel/eslint-plugin": "^7.12.13", + "@babel/plugin-proposal-object-rest-spread": "^7.10.1", + "@babel/preset-env": "^7.10.2", + "@babel/preset-typescript": "^7.8.3", + "@emotion/core": "^10.0.14", + "@emotion/memoize": "^0.7.5", + "@emotion/react": "^11.1.5", + "@emotion/styled": "^10.0.14", + "@emotion/utils": "^1.0.0", + "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1", + "autoprefixer": "^10.2.4", + "axios-mock-adapter": "^1.17.0", + "babel-loader": "^8.1.0", + "browserify": "^17.0.0", + "buffer": "^6.0.3", + "copy-webpack-plugin": "^7.0.0", + "core-js": "^3.2.1", + "cross-env": "^7.0.3", + "css-minimizer-webpack-plugin": "^3.0.0", + "enzyme": "^3.11.0", + "eslint": "^7.19.0", + "eslint-plugin-react": "^7.20.5", + "eslint-plugin-react-hooks": "^4.3.0", + "exports-loader": "^2.0.0", + "html-react-parser": "^1.2.7", + "image-minimizer-webpack-plugin": "^2.2.0", + "imagemin-mozjpeg": "^9.0.0", + "imagemin-optipng": "^8.0.0", + "imagemin-pngquant": "^9.0.1", + "imagemin-svgo": "^8.0.0", + "is-docker": "^2.1.1", + "jasmine-core": "^3.6.0", + "jasmine-enzyme": "^7.1.2", + "karma": "^6.3.2", + "karma-babel-preprocessor": "^8.0.0", + "karma-browserify": "^8.0.0", + "karma-chrome-launcher": "^3.1.0", + "karma-jasmine": "^4.0.1", + "karma-jasmine-html-reporter": "^1.4.0", + "karma-requirejs": "~1.1.0", + "karma-source-map-support": "^1.4.0", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^5.0.0", + "mini-css-extract-plugin": "^1.3.5", + "popper.js": "^1.16.1", + "postcss-loader": "^5.0.0", + "process": "^0.11.10", + "prop-types": "^15.7.2", + "resize-observer-polyfill": "^1.5.1", + "sass": "^1.24.4", + "sass-loader": "^11.0.0", + "sass-resources-loader": "^2.2.1", + "style-loader": "^2.0.0", + "stylis": "^4.0.7", + "svgo": "^1.1.1", + "svgo-loader": "^2.2.0", + "terser-webpack-plugin": "^5.1.1", + "typescript": "^3.2.2", + "webfonts-loader": "^7.3.0", + "webpack": "^5.21.2", + "webpack-bundle-analyzer": "^4.4.0", + "webpack-cli": "^4.5.0", + "yarn-audit-html": "^2.0.0" + }, + "dependencies": { + "@babel/plugin-proposal-class-properties": "^7.10.4", + "@babel/preset-react": "^7.12.13", + "@date-io/core": "^1.3.6", + "@date-io/date-fns": "1.x", + "@emotion/sheet": "^1.0.1", + "@fortawesome/fontawesome-free": "^5.14.0", + "@material-ui/core": "4.11.0", + "@material-ui/icons": "^4.11.2", + "@material-ui/lab": "4.0.0-alpha.58", + "@material-ui/pickers": "^3.2.10", + "@projectstorm/react-diagrams": "^6.6.1", + "@simonwep/pickr": "^1.5.1", + "@tippyjs/react": "^4.2.0", + "@types/classnames": "^2.2.6", + "@types/react": "^16.7.18", + "@types/react-dom": "^16.0.11", + "acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7", + "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263", + "aspen-decorations": "^1.0.2", + "axios": "^0.21.1", + "babelify": "~10.0.0", + "backbone": "1.4.0", + "backform": "^0.2.0", + "backgrid-filter": "^0.3.7", + "backgrid-select-all": "^0.3.5", + "bignumber.js": "^9.0.1", + "bootstrap": "^4.3.1", + "bootstrap-datepicker": "^1.8.0", + "bootstrap4-toggle": "^3.6.1", + "browserfs": "^1.4.3", + "chart.js": "^2.9.3", + "classnames": "^2.2.6", + "closest": "^0.0.1", + "codemirror": "^5.59.2", + "context-menu": "^2.0.0", + "css-loader": "^5.0.1", + "cssnano": "^5.0.2", + "dagre": "^0.8.4", + "date-fns": "^2.24.0", + "diff-arrays-of-objects": "^1.1.8", + "dropzone": "^5.9.3", + "html2canvas": "^1.0.0-rc.7", + "immutability-helper": "^3.0.0", + "imports-loader": "^2.0.0", + "insert-if": "^1.1.0", + "ip-address": "^7.1.0", + "istanbul-instrumenter-loader": "^3.0.1", + "jquery": "^3.6.0", + "jquery-contextmenu": "^2.9.2", + "jquery-ui": "^1.13.0", + "json-bignumber": "^1.0.1", + "jsoneditor": "^9.5.4", + "karma-coverage": "^2.0.3", + "leaflet": "^1.5.1", + "lodash": "4.*", + "ml-matrix": "^6.5.0", + "moment": "^2.29.1", + "moment-timezone": "^0.5.33", + "mousetrap": "^1.6.3", + "notificar": "^1.0.1", + "notistack": "^1.0.10", + "path-fx": "^2.0.0", + "pathfinding": "^0.4.18", + "paths-js": "^0.4.9", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422", + "postcss": "^8.2.15", + "raf": "^3.4.1", + "react": "^17.0.1", + "react-aspen": "^1.1.0", + "react-checkbox-tree": "^1.7.2", + "react-dom": "^17.0.1", + "react-draggable": "^4.4.4", + "react-select": "^4.2.1", + "react-table": "^7.6.3", + "react-virtualized-auto-sizer": "^1.0.6", + "react-window": "^1.8.5", + "select2": "^4.0.13", + "shim-loader": "^1.0.1", + "slickgrid": "git+https://github.com/6pac/SlickGrid.git#2.3.16", + "snapsvg-cjs": "^0.0.6", + "socket.io-client": "^4.0.0", + "split.js": "^1.5.10", + "styled-components": "^5.2.1", + "tablesorter": "^2.31.2", + "tempusdominus-bootstrap-4": "^5.1.2", + "tempusdominus-core": "^5.0.3", + "underscore": "^1.13.1", + "url-loader": "^1.1.2", + "valid-filename": "^2.0.1", + "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd", + "wkx": "^0.5.0", + "xterm": "^4.11.0", + "xterm-addon-fit": "^0.5.0", + "xterm-addon-search": "^0.8.0", + "xterm-addon-web-links": "^0.4.0" + }, + "scripts": { + "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx .", + "webpacker": "yarn run webpack --config webpack.config.js --progress", + "webpacker:watch": "yarn run webpack --config webpack.config.js --progress --watch", + "bundle:watch": "yarn run linter && yarn run webpacker:watch", + "bundle:dev": "yarn run linter && yarn run webpacker", + "bundle:analyze": "cross-env NODE_ENV=production ANALYZE=true yarn run bundle:dev", + "bundle": "cross-env NODE_ENV=production yarn run bundle:dev", + "test:karma-once": "yarn run linter && yarn run karma start --single-run", + "test:karma": "yarn run linter && yarn run karma start", + "test:karma-coverage": "yarn run test:karma-once --reporters coverage,progress", + "test:feature": "yarn run bundle && python regression/runtests.py --pkg feature_tests", + "test": "yarn run test:karma-once && yarn run bundle && python regression/runtests.py", + "pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web", + "auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html", + "auditjs": "yarn audit --groups dependencies", + "auditpy": "safety check --full-report -i 40493", + "audit": "yarn run auditjs && yarn run auditpy" + } +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock new file mode 100644 index 0000000000..7c108d4df8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -0,0 +1,9809 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + dependencies: + "@babel/highlight" "^7.12.13" + +"@babel/code-frame@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== + dependencies: + "@babel/highlight" "^7.14.5" + +"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== + +"@babel/core@^7.10.2", "@babel/core@^7.7.5": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.8.tgz#c191d9c5871788a591d69ea1dc03e5843a3680fb" + integrity sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.13.0" + "@babel/helper-compilation-targets" "^7.13.8" + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helpers" "^7.13.0" + "@babel/parser" "^7.13.4" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + lodash "^4.17.19" + semver "^6.3.0" + source-map "^0.5.0" + +"@babel/eslint-parser@^7.12.13": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687" + integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw== + dependencies: + eslint-scope "5.1.0" + eslint-visitor-keys "^1.3.0" + semver "^6.3.0" + +"@babel/eslint-plugin@^7.12.13": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b" + integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w== + dependencies: + eslint-rule-composer "^0.3.0" + +"@babel/generator@^7.13.0", "@babel/generator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" + integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== + dependencies: + "@babel/types" "^7.14.5" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" + integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" + integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" + integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== + dependencies: + "@babel/compat-data" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + browserslist "^4.16.6" + semver "^6.3.0" + +"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.6": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542" + integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + +"@babel/helper-create-regexp-features-plugin@^7.12.13": + version "7.14.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz#149aa6d78c016e318c43e2409a0ae9c136a86688" + integrity sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + regexpu-core "^4.7.1" + +"@babel/helper-define-polyfill-provider@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e" + integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg== + dependencies: + "@babel/helper-compilation-targets" "^7.13.0" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/traverse" "^7.13.0" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + +"@babel/helper-explode-assignable-expression@^7.12.13": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" + integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== + dependencies: + "@babel/types" "^7.13.0" + +"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== + dependencies: + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.13.0", "@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-member-expression-to-functions@^7.14.5": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" + integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== + dependencies: + "@babel/types" "^7.13.12" + +"@babel/helper-module-transforms@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" + integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-replace-supers" "^7.13.0" + "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + lodash "^4.17.19" + +"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" + integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-remap-async-to-generator@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" + integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" + integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-simple-access@^7.12.13": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== + dependencies: + "@babel/types" "^7.13.12" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" + integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== + +"@babel/helper-validator-option@^7.12.17", "@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helper-wrap-function@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" + integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== + dependencies: + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/helpers@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" + integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== + dependencies: + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.13.4", "@babel/parser@^7.14.5", "@babel/parser@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" + integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== + +"@babel/plugin-proposal-async-generator-functions@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" + integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-remap-async-to-generator" "^7.13.0" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" + integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-proposal-dynamic-import@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" + integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + +"@babel/plugin-proposal-export-namespace-from@^7.12.13": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz#62542f94aa9ce8f6dba79eec698af22112253791" + integrity sha512-sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + +"@babel/plugin-proposal-json-strings@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" + integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" + +"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" + integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" + integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + +"@babel/plugin-proposal-numeric-separator@^7.12.13": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz#82b4cc06571143faf50626104b335dd71baa4f9e" + integrity sha512-DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + +"@babel/plugin-proposal-object-rest-spread@^7.10.1", "@babel/plugin-proposal-object-rest-spread@^7.13.8": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" + integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== + dependencies: + "@babel/compat-data" "^7.14.7" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.14.5" + +"@babel/plugin-proposal-optional-catch-binding@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" + integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + +"@babel/plugin-proposal-optional-chaining@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756" + integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-proposal-private-methods@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" + integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" + integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-dynamic-import@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-jsx@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" + integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-typescript@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-arrow-functions@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" + integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-async-to-generator@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" + integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-remap-async-to-generator" "^7.13.0" + +"@babel/plugin-transform-block-scoped-functions@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" + integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-block-scoping@^7.12.13": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c" + integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-classes@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" + integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-replace-supers" "^7.13.0" + "@babel/helper-split-export-declaration" "^7.12.13" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" + integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-destructuring@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963" + integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" + integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-duplicate-keys@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" + integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-exponentiation-operator@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" + integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-for-of@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" + integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" + integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== + dependencies: + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" + integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-member-expression-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" + integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-modules-amd@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" + integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== + dependencies: + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" + integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== + dependencies: + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-simple-access" "^7.12.13" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.13.8": + version "7.13.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" + integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== + dependencies: + "@babel/helper-hoist-variables" "^7.13.0" + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-identifier" "^7.12.11" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" + integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== + dependencies: + "@babel/helper-module-transforms" "^7.13.0" + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" + integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + +"@babel/plugin-transform-new-target@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" + integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-object-super@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" + integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + +"@babel/plugin-transform-parameters@^7.13.0", "@babel/plugin-transform-parameters@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" + integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-property-literals@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" + integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-react-display-name@^7.12.13": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz#2e854544d42ab3bb9c21f84e153d62e800fbd593" + integrity sha512-zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-react-jsx-development@^7.12.17": + version "7.12.17" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447" + integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ== + dependencies: + "@babel/plugin-transform-react-jsx" "^7.12.17" + +"@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz#1df5dfaf0f4b784b43e96da6f28d630e775f68b3" + integrity sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/plugin-syntax-jsx" "^7.12.13" + "@babel/types" "^7.13.12" + +"@babel/plugin-transform-react-pure-annotations@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" + integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-regenerator@^7.12.13": + version "7.13.15" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" + integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== + dependencies: + regenerator-transform "^0.14.2" + +"@babel/plugin-transform-reserved-words@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" + integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-shorthand-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" + integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-spread@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" + integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + +"@babel/plugin-transform-sticky-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" + integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-template-literals@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" + integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + +"@babel/plugin-transform-typeof-symbol@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" + integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-typescript@^7.14.5": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c" + integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.6" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-typescript" "^7.14.5" + +"@babel/plugin-transform-unicode-escapes@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" + integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-unicode-regex@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" + integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/preset-env@^7.10.2": + version "7.13.9" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.9.tgz#3ee5f233316b10d066d7f379c6d1e13a96853654" + integrity sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ== + dependencies: + "@babel/compat-data" "^7.13.8" + "@babel/helper-compilation-targets" "^7.13.8" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-option" "^7.12.17" + "@babel/plugin-proposal-async-generator-functions" "^7.13.8" + "@babel/plugin-proposal-class-properties" "^7.13.0" + "@babel/plugin-proposal-dynamic-import" "^7.13.8" + "@babel/plugin-proposal-export-namespace-from" "^7.12.13" + "@babel/plugin-proposal-json-strings" "^7.13.8" + "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" + "@babel/plugin-proposal-numeric-separator" "^7.12.13" + "@babel/plugin-proposal-object-rest-spread" "^7.13.8" + "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" + "@babel/plugin-proposal-optional-chaining" "^7.13.8" + "@babel/plugin-proposal-private-methods" "^7.13.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.12.13" + "@babel/plugin-transform-arrow-functions" "^7.13.0" + "@babel/plugin-transform-async-to-generator" "^7.13.0" + "@babel/plugin-transform-block-scoped-functions" "^7.12.13" + "@babel/plugin-transform-block-scoping" "^7.12.13" + "@babel/plugin-transform-classes" "^7.13.0" + "@babel/plugin-transform-computed-properties" "^7.13.0" + "@babel/plugin-transform-destructuring" "^7.13.0" + "@babel/plugin-transform-dotall-regex" "^7.12.13" + "@babel/plugin-transform-duplicate-keys" "^7.12.13" + "@babel/plugin-transform-exponentiation-operator" "^7.12.13" + "@babel/plugin-transform-for-of" "^7.13.0" + "@babel/plugin-transform-function-name" "^7.12.13" + "@babel/plugin-transform-literals" "^7.12.13" + "@babel/plugin-transform-member-expression-literals" "^7.12.13" + "@babel/plugin-transform-modules-amd" "^7.13.0" + "@babel/plugin-transform-modules-commonjs" "^7.13.8" + "@babel/plugin-transform-modules-systemjs" "^7.13.8" + "@babel/plugin-transform-modules-umd" "^7.13.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" + "@babel/plugin-transform-new-target" "^7.12.13" + "@babel/plugin-transform-object-super" "^7.12.13" + "@babel/plugin-transform-parameters" "^7.13.0" + "@babel/plugin-transform-property-literals" "^7.12.13" + "@babel/plugin-transform-regenerator" "^7.12.13" + "@babel/plugin-transform-reserved-words" "^7.12.13" + "@babel/plugin-transform-shorthand-properties" "^7.12.13" + "@babel/plugin-transform-spread" "^7.13.0" + "@babel/plugin-transform-sticky-regex" "^7.12.13" + "@babel/plugin-transform-template-literals" "^7.13.0" + "@babel/plugin-transform-typeof-symbol" "^7.12.13" + "@babel/plugin-transform-unicode-escapes" "^7.12.13" + "@babel/plugin-transform-unicode-regex" "^7.12.13" + "@babel/preset-modules" "^0.1.4" + "@babel/types" "^7.13.0" + babel-plugin-polyfill-corejs2 "^0.1.4" + babel-plugin-polyfill-corejs3 "^0.1.3" + babel-plugin-polyfill-regenerator "^0.1.2" + core-js-compat "^3.9.0" + semver "^6.3.0" + +"@babel/preset-modules@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/preset-react@^7.12.13": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761" + integrity sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-validator-option" "^7.12.17" + "@babel/plugin-transform-react-display-name" "^7.12.13" + "@babel/plugin-transform-react-jsx" "^7.13.12" + "@babel/plugin-transform-react-jsx-development" "^7.12.17" + "@babel/plugin-transform-react-pure-annotations" "^7.12.1" + +"@babel/preset-typescript@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz#aa98de119cf9852b79511f19e7f44a2d379bcce0" + integrity sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-transform-typescript" "^7.14.5" + +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6" + integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.12.13", "@babel/template@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.4.5": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" + integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.7" + "@babel/types" "^7.14.5" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.14.5", "@babel/types@^7.4.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.4.tgz#74eeb86dbd6748d2741396557b9860e57fce0a0d" + integrity sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw== + dependencies: + "@babel/helper-validator-identifier" "^7.14.9" + to-fast-properties "^2.0.0" + +"@date-io/core@1.x", "@date-io/core@^1.3.13", "@date-io/core@^1.3.6": + version "1.3.13" + resolved "https://registry.yarnpkg.com/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa" + integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA== + +"@date-io/date-fns@1.x": + version "1.3.13" + resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735" + integrity sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA== + dependencies: + "@date-io/core" "^1.3.13" + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" + integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== + +"@emotion/cache@^10.0.27": + version "10.0.29" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" + integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ== + dependencies: + "@emotion/sheet" "0.9.4" + "@emotion/stylis" "0.8.5" + "@emotion/utils" "0.11.3" + "@emotion/weak-memoize" "0.2.5" + +"@emotion/cache@^11.4.0": + version "11.4.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0" + integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.0.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "^4.0.3" + +"@emotion/core@^10.0.14": + version "10.1.1" + resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" + integrity sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA== + dependencies: + "@babel/runtime" "^7.5.5" + "@emotion/cache" "^10.0.27" + "@emotion/css" "^10.0.27" + "@emotion/serialize" "^0.11.15" + "@emotion/sheet" "0.9.4" + "@emotion/utils" "0.11.3" + +"@emotion/css@^10.0.27": + version "10.0.27" + resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c" + integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw== + dependencies: + "@emotion/serialize" "^0.11.15" + "@emotion/utils" "0.11.3" + babel-plugin-emotion "^10.0.27" + +"@emotion/hash@0.8.0", "@emotion/hash@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" + integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== + +"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.8": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== + dependencies: + "@emotion/memoize" "0.7.4" + +"@emotion/memoize@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== + +"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" + integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== + +"@emotion/react@^11.1.1", "@emotion/react@^11.1.5": + version "11.4.0" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.4.0.tgz#2465ad7b073a691409b88dfd96dc17097ddad9b7" + integrity sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg== + dependencies: + "@babel/runtime" "^7.13.10" + "@emotion/cache" "^11.4.0" + "@emotion/serialize" "^1.0.2" + "@emotion/sheet" "^1.0.1" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + hoist-non-react-statics "^3.3.1" + +"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16": + version "0.11.16" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad" + integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg== + dependencies: + "@emotion/hash" "0.8.0" + "@emotion/memoize" "0.7.4" + "@emotion/unitless" "0.7.5" + "@emotion/utils" "0.11.3" + csstype "^2.5.7" + +"@emotion/serialize@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965" + integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A== + dependencies: + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.4" + "@emotion/unitless" "^0.7.5" + "@emotion/utils" "^1.0.0" + csstype "^3.0.2" + +"@emotion/sheet@0.9.4": + version "0.9.4" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5" + integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA== + +"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" + integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== + +"@emotion/styled-base@^10.0.27": + version "10.0.31" + resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a" + integrity sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ== + dependencies: + "@babel/runtime" "^7.5.5" + "@emotion/is-prop-valid" "0.8.8" + "@emotion/serialize" "^0.11.15" + "@emotion/utils" "0.11.3" + +"@emotion/styled@^10.0.14": + version "10.0.27" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf" + integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q== + dependencies: + "@emotion/styled-base" "^10.0.27" + babel-plugin-emotion "^10.0.27" + +"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== + +"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== + +"@emotion/utils@0.11.3": + version "0.11.3" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924" + integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw== + +"@emotion/utils@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af" + integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA== + +"@emotion/weak-memoize@0.2.5", "@emotion/weak-memoize@^0.2.5": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" + integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== + +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@fortawesome/fontawesome-free@^5.14.0": + version "5.15.4" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" + integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== + +"@gar/promisify@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" + integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== + +"@istanbuljs/schema@^0.1.2": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== + +"@material-ui/core@4.11.0": + version "4.11.0" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a" + integrity sha512-bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/styles" "^4.10.0" + "@material-ui/system" "^4.9.14" + "@material-ui/types" "^5.1.0" + "@material-ui/utils" "^4.10.2" + "@types/react-transition-group" "^4.2.0" + clsx "^1.0.4" + hoist-non-react-statics "^3.3.2" + popper.js "1.16.1-lts" + prop-types "^15.7.2" + react-is "^16.8.0" + react-transition-group "^4.4.0" + +"@material-ui/icons@^4.11.2": + version "4.11.2" + resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5" + integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ== + dependencies: + "@babel/runtime" "^7.4.4" + +"@material-ui/lab@4.0.0-alpha.58": + version "4.0.0-alpha.58" + resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.58.tgz#c7ebb66f49863c5acbb20817163737caa299fafc" + integrity sha512-GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.11.2" + clsx "^1.0.4" + prop-types "^15.7.2" + react-is "^16.8.0 || ^17.0.0" + +"@material-ui/pickers@^3.2.10": + version "3.2.10" + resolved "https://registry.yarnpkg.com/@material-ui/pickers/-/pickers-3.2.10.tgz#19df024895876eb0ec7cd239bbaea595f703f0ae" + integrity sha512-B8G6Obn5S3RCl7hwahkQj9sKUapwXWFjiaz/Bsw1fhYFdNMnDUolRiWQSoKPb1/oKe37Dtfszoywi1Ynbo3y8w== + dependencies: + "@babel/runtime" "^7.6.0" + "@date-io/core" "1.x" + "@types/styled-jsx" "^2.2.8" + clsx "^1.0.2" + react-transition-group "^4.0.0" + rifm "^0.7.0" + +"@material-ui/styles@^4.10.0": + version "4.11.4" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d" + integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew== + dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "5.1.0" + "@material-ui/utils" "^4.11.2" + clsx "^1.0.4" + csstype "^2.5.2" + hoist-non-react-statics "^3.3.2" + jss "^10.5.1" + jss-plugin-camel-case "^10.5.1" + jss-plugin-default-unit "^10.5.1" + jss-plugin-global "^10.5.1" + jss-plugin-nested "^10.5.1" + jss-plugin-props-sort "^10.5.1" + jss-plugin-rule-value-function "^10.5.1" + jss-plugin-vendor-prefixer "^10.5.1" + prop-types "^15.7.2" + +"@material-ui/system@^4.9.14": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c" + integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.11.2" + csstype "^2.5.2" + prop-types "^15.7.2" + +"@material-ui/types@5.1.0", "@material-ui/types@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" + integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== + +"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.11.2": + version "4.11.2" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a" + integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA== + dependencies: + "@babel/runtime" "^7.4.4" + prop-types "^15.7.2" + react-is "^16.8.0 || ^17.0.0" + +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== + dependencies: + "@nodelib/fs.stat" "2.0.4" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + dependencies: + "@nodelib/fs.scandir" "2.1.4" + fastq "^1.6.0" + +"@npmcli/fs@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" + integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + +"@npmcli/move-file@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@polka/url@^1.0.0-next.15": + version "1.0.0-next.15" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" + integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== + +"@popperjs/core@^2.8.3": + version "2.9.0" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546" + integrity sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew== + +"@projectstorm/geometry@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/geometry/-/geometry-6.6.1.tgz#4a42f5c8fdfcc3d951e73f5db7fe9546514acc3d" + integrity sha512-gWRkv+fm+VIpoffHzDHPmGYlEqx8xWGfE/JR7TXAZweNdjEIxyhT++hVlCJiFJS+/cGqgN3z+eP7PNjwZUPGRg== + +"@projectstorm/react-canvas-core@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/react-canvas-core/-/react-canvas-core-6.6.1.tgz#93cc6e70e986fe620b6fad6b597d3aa038075244" + integrity sha512-wAxEh4Wja2Au0QAuLqxJNaWpVxYIffTFUZhjH8wtW8MKCWS6W9RnP6upeC8QVQi29NS59UIX4wXNzb6e6ht5ww== + dependencies: + "@projectstorm/geometry" "^6.6.1" + +"@projectstorm/react-diagrams-core@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/react-diagrams-core/-/react-diagrams-core-6.6.1.tgz#f626c6253dd6f4b04c3256976b55377ffac2b1bb" + integrity sha512-TiDwpcH+t2b2tG/UHDQvhlyx3gOQRJXxTyNDo7p+430ikTrvz1f8uNe5Rt3SrzyqxeUazLFXYBgbGpEanqOykQ== + dependencies: + "@projectstorm/geometry" "^6.6.1" + "@projectstorm/react-canvas-core" "^6.6.1" + +"@projectstorm/react-diagrams-defaults@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/react-diagrams-defaults/-/react-diagrams-defaults-6.6.1.tgz#a97cdda56d7336b84775f76a925b90286ea2833d" + integrity sha512-FJu8BNBjvANVZ8N99WXS/f6Mu5/yMC4Pi55kTG3vq7o14tsVMcghosmxst5eoeL251O4I+ulNvQ/yCc1Mc5org== + dependencies: + "@projectstorm/react-diagrams-core" "^6.6.1" + +"@projectstorm/react-diagrams-routing@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/react-diagrams-routing/-/react-diagrams-routing-6.6.1.tgz#06b77ab1f94f4567391099ffe5e1d91db34408ff" + integrity sha512-m8akJynhanxmpc/A2U7bcgFxIMxsjb3zmYBRGFltVJve87mir8ACaH2gmiHYcAfgEHxdh+x7mCuUlfNP242Ytw== + dependencies: + "@projectstorm/geometry" "^6.6.1" + "@projectstorm/react-diagrams-core" "^6.6.1" + "@projectstorm/react-diagrams-defaults" "^6.6.1" + +"@projectstorm/react-diagrams@^6.6.1": + version "6.6.1" + resolved "https://registry.yarnpkg.com/@projectstorm/react-diagrams/-/react-diagrams-6.6.1.tgz#3af4007613f487ba58801cdcded955683b3f01c5" + integrity sha512-tLSXfEf/dGFUN8JCCRMrYyIBhhn+eVw24xQodmtcReJxQpKa31EWh9CmJ6UEg7xUnabMG9f2plOPyJqyFssGTA== + dependencies: + "@projectstorm/react-diagrams-core" "^6.6.1" + "@projectstorm/react-diagrams-defaults" "^6.6.1" + "@projectstorm/react-diagrams-routing" "^6.6.1" + +"@simonwep/pickr@^1.5.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@simonwep/pickr/-/pickr-1.8.1.tgz#e136cbd9c345ddbb7d71eb14af544c798165d495" + integrity sha512-3Q5+INWW0Py+/E9hgy0cyD0/0w/yGZbkxam6RzFVFDOEHgAqMVJR+x9znx58/ky/ZIvE/78FbH189yIC9h111A== + dependencies: + core-js "^3.12.1" + nanopop "^2.1.0" + +"@sindresorhus/is@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" + integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== + +"@sphinxxxx/color-conversion@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz#03ecc29279e3c0c832f6185a5bfa3497858ac8ca" + integrity sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw== + +"@tippyjs/react@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/@tippyjs/react/-/react-4.2.3.tgz#c2dbe9eb71bd9ffa3974f9ba8e3a4a6fc1538aed" + integrity sha512-44vBapqROQI7Q5nDtX1MMAgcAV+3DsIi+m/45CxQ72C5LDNmNDq9h3f04x3NHMrUhWcfgfgjYA2EmeLSH/4eRg== + dependencies: + tippy.js "^6.3.1" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + +"@types/classnames@^2.2.6": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd" + integrity sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A== + dependencies: + classnames "*" + +"@types/component-emitter@^1.2.10": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" + integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== + +"@types/cookie@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" + integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== + +"@types/cors@^2.8.8": + version "2.8.10" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" + integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== + +"@types/eslint-scope@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" + integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.2.7" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.7.tgz#f7ef1cf0dceab0ae6f9a976a0a9af14ab1baca26" + integrity sha512-EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.46": + version "0.0.46" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" + integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== + +"@types/glob@^7.1.1": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== + +"@types/minimatch@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + +"@types/node@*", "@types/node@>=10.0.0": + version "14.14.32" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448" + integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/prop-types@*": + version "15.7.3" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" + integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + +"@types/q@^1.5.1": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" + integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + +"@types/react-dom@^16.0.11": + version "16.9.14" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz#674b8f116645fe5266b40b525777fc6bb8eb3bcd" + integrity sha512-FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A== + dependencies: + "@types/react" "^16" + +"@types/react-transition-group@^4.2.0": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" + integrity sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^16": + version "16.14.10" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" + integrity sha512-QadBsMyF6ldjEAXEhsmEW/L0uBDJT8yw7Qoe5sRnEKVrzMkiYoJwqoL5TKJOlArsn/wvIJM/XdVzkdL6+AS64Q== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/react@^16.7.18": + version "16.14.18" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.18.tgz#b2bcea05ee244fde92d409f91bd888ca8e54b20f" + integrity sha512-eeyqd1mqoG43mI0TvNKy9QNf1Tjz3DEOsRP3rlPo35OeMIt05I+v9RR8ZvL2GuYZeF2WAcLXJZMzu6zdz3VbtQ== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/scheduler@*": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" + integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== + +"@types/styled-jsx@^2.2.8": + version "2.2.8" + resolved "https://registry.yarnpkg.com/@types/styled-jsx/-/styled-jsx-2.2.8.tgz#b50d13d8a3c34036282d65194554cf186bab7234" + integrity sha512-Yjye9VwMdYeXfS71ihueWRSxrruuXTwKCbzue4+5b2rjnQ//AtyM7myZ1BEhNhBQ/nL/RE7bdToUoLln2miKvg== + dependencies: + "@types/react" "*" + +"@vusion/webfonts-generator@^0.7.2": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz#f940348b6251edfba4b2961097f44a391670e63d" + integrity sha512-0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw== + dependencies: + handlebars "^4.0.11" + mkdirp "^1.0.4" + q "^1.1.2" + svg2ttf "^5.0.0" + svgicons2svgfont "^9.0.3" + ttf2eot "^2.0.0" + ttf2woff "^2.0.1" + ttf2woff2 "^4.0.1" + underscore "^1.9.1" + url-join "^4.0.0" + +"@webassemblyjs/ast@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" + integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + +"@webassemblyjs/floating-point-hex-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" + integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== + +"@webassemblyjs/helper-api-error@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" + integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== + +"@webassemblyjs/helper-buffer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" + integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== + +"@webassemblyjs/helper-numbers@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" + integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" + integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== + +"@webassemblyjs/helper-wasm-section@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" + integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + +"@webassemblyjs/ieee754@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" + integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" + integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" + integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== + +"@webassemblyjs/wasm-edit@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" + integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/helper-wasm-section" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-opt" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wast-printer" "1.11.0" + +"@webassemblyjs/wasm-gen@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" + integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + +"@webassemblyjs/wasm-opt@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" + integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + +"@webassemblyjs/wasm-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" + integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + +"@webassemblyjs/wast-printer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" + integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" + integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== + +"@webpack-cli/info@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" + integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" + integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== + +"@wojtekmaj/enzyme-adapter-react-17@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.4.1.tgz#a9d4a2873025c6de19e1142ca076661bac69f587" + integrity sha512-WZr8i4C6WVDV7Mb8sbm7GdlEPmk1f+xOMjUKThqrkWgwsfvu90zJyyX54wyAvsS91sjtKZ0JipGj2cJnEDaxPA== + dependencies: + enzyme-adapter-utils "^1.14.0" + enzyme-shallow-equal "^1.0.4" + has "^1.0.3" + object.assign "^4.1.0" + object.values "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.0" + react-test-renderer "^17.0.0" + semver "^5.7.0" + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +FileSaver@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz#7def3889944458042ef5df2e9064c88e3d2281c7" + integrity sha1-fe84iZREWAQu9d8ukGTIjj0igcc= + +JSONStream@^1.0.3: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +accepts@~1.3.4: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +ace-builds@^1.4.12: + version "1.4.12" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7" + integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg== + +"acitree@git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7": + version "4.5.0-rc.7" + resolved "git+https://github.com/imsurinder90/jquery-aciTree.git#24dcd7536a008abe25da6adb7bfde8eeb53892f1" + +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== + dependencies: + acorn "^7.0.0" + acorn-walk "^7.0.0" + xtend "^4.0.2" + +acorn-walk@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn-walk@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.0.tgz#d3c6a9faf00987a5e2b9bdb506c2aa76cd707f83" + integrity sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg== + +acorn@^7.0.0, acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +acorn@^8.0.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== + +agent-base@6, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agentkeepalive@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" + integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +airbnb-prop-types@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2" + integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg== + dependencies: + array.prototype.find "^2.1.1" + function.prototype.name "^1.1.2" + is-regex "^1.1.0" + object-is "^1.1.2" + object.assign "^4.1.0" + object.entries "^1.1.2" + prop-types "^15.7.2" + prop-types-exact "^1.2.0" + react-is "^16.13.1" + +ajv-errors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" + integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== + +ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^5.0.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b" + integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +"alertifyjs@git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263": + version "1.7.1" + resolved "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263" + +alphanum-sort@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +arch@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== + +archive-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70" + integrity sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA= + dependencies: + file-type "^4.2.0" + +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.6, argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-includes@^3.1.2, array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" + is-string "^1.0.5" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz#24d63e38983cdc6bf023a3c574b2f2a3f384c301" + integrity sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.5" + +array.prototype.find@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c" + integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.4" + +array.prototype.flat@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +array.prototype.flatmap@1.2.4, array.prototype.flatmap@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" + integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + function-bind "^1.1.1" + +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" + +aspen-core@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/aspen-core/-/aspen-core-1.0.4.tgz#a2d6a23c80303e73aaa836c124c116e447ba7a7d" + integrity sha512-mQ79JxHstB2rf47Zgw2yduAH9L47b+3bwQtpbEAKeSJsLTPe8X7lsQ6lLP3tFbS204TNILC5LxSkVWv45FXQYg== + dependencies: + notificar "^1.0.1" + p-series "^1.1.0" + path-fx "^2.1.1" + +aspen-decorations@^1.0.2, aspen-decorations@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3" + integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ== + dependencies: + notificar "^1.0.1" + +aspen-tree-model@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/aspen-tree-model/-/aspen-tree-model-1.0.5.tgz#23d5ce7a8fb7ab905d37b17b930cc6f92e4d366e" + integrity sha512-kcdL22iAT1sp1HTQ3wJnQqSeA2ANSQiOZJ86RMk9tKBZjb5EFSs2khEFQ6iYE7bvHcWTarGzD7X8XKfxe/zxXg== + dependencies: + aspen-core "^1.0.4" + notificar "^1.0.1" + +assert@^1.4.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" + integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== + dependencies: + object-assign "^4.1.1" + util "0.10.3" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + +async@^2.1.4: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + +async@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + +autoprefixer@^10.2.4: + version "10.2.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.6.tgz#aadd9ec34e1c98d403e01950038049f0eb252949" + integrity sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg== + dependencies: + browserslist "^4.16.6" + caniuse-lite "^1.0.30001230" + colorette "^1.2.2" + fraction.js "^4.1.1" + normalize-range "^0.1.2" + postcss-value-parser "^4.1.0" + +available-typed-arrays@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9" + integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA== + +axios-mock-adapter@^1.17.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz#9d72e321a6c5418e1eff067aa99761a86c5188a4" + integrity sha512-D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg== + dependencies: + fast-deep-equal "^3.1.3" + is-buffer "^2.0.3" + +axios@^0.21.1: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-generator@^6.18.0: + version "6.26.1" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" + integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== + dependencies: + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + detect-indent "^4.0.0" + jsesc "^1.3.0" + lodash "^4.17.4" + source-map "^0.5.7" + trim-right "^1.0.1" + +babel-loader@^8.1.0: + version "8.2.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" + integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== + dependencies: + find-cache-dir "^3.3.1" + loader-utils "^1.4.0" + make-dir "^3.1.0" + schema-utils "^2.6.5" + +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-dynamic-import-node@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-emotion@^10.0.27: + version "10.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d" + integrity sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@emotion/hash" "0.8.0" + "@emotion/memoize" "0.7.4" + "@emotion/serialize" "^0.11.16" + babel-plugin-macros "^2.0.0" + babel-plugin-syntax-jsx "^6.18.0" + convert-source-map "^1.5.0" + escape-string-regexp "^1.0.5" + find-root "^1.1.0" + source-map "^0.5.7" + +babel-plugin-macros@^2.0.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + +babel-plugin-polyfill-corejs2@^0.1.4: + version "0.1.10" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1" + integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA== + dependencies: + "@babel/compat-data" "^7.13.0" + "@babel/helper-define-polyfill-provider" "^0.1.5" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.1.3: + version "0.1.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0" + integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.1.5" + core-js-compat "^3.8.1" + +babel-plugin-polyfill-regenerator@^0.1.2: + version "0.1.6" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f" + integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.1.5" + +"babel-plugin-styled-components@>= 1": + version "1.12.0" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9" + integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-module-imports" "^7.0.0" + babel-plugin-syntax-jsx "^6.18.0" + lodash "^4.17.11" + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + +babel-runtime@^6.22.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.16.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.18.0, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.18.0, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babelify@~10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz#fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5" + integrity sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg== + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== + +"backbone@1.1.2 || 1.2.3 || ~1.3.2": + version "1.3.3" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" + integrity sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk= + dependencies: + underscore ">=1.8.3" + +backbone@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12" + integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ== + dependencies: + underscore ">=1.8.3" + +backbone@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9" + integrity sha1-wiz9B/yG676uYdGJKe0RXpmdZbk= + dependencies: + underscore ">=1.7.0" + +backform@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz#b14cb8deb08c863fc595a2bc505066e32a2ad4ce" + integrity sha1-sUy43rCMhj/FlaK8UFBm4yoq1M4= + +backgrid-filter@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz#d4b19d0e707013d7f181f9e8c7febb4997d56f03" + integrity sha1-1LGdDnBwE9fxgfnox/67SZfVbwM= + dependencies: + backbone "~1.2.3" + backgrid "~0.3.7" + lunr "^0.7.0" + underscore "^1.8.3" + +backgrid-select-all@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz#143a800e5d95ff2ae5a84d78bf4fba41f9481e94" + integrity sha1-FDqADl2V/yrlqE14v0+6QflIHpQ= + +backgrid@~0.3.7: + version "0.3.8" + resolved "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz#7d26816742d72c859cad39b13f19c9f27baffed7" + integrity sha1-fSaBZ0LXLIWcrTmxPxnJ8nuv/tc= + dependencies: + backbone "1.1.2 || 1.2.3 || ~1.3.2" + underscore "^1.8.0" + +backo2@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-arraybuffer@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" + integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= + +base64-arraybuffer@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45" + integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ== + +base64-js@^1.0.2, base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +base64id@2.0.0, base64id@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" + integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +bignumber.js@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" + integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== + +bignumber.js@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5" + integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA== + +bin-build@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz#c5780a25a8a9f966d8244217e6c1f5082a143861" + integrity sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA== + dependencies: + decompress "^4.0.0" + download "^6.2.2" + execa "^0.7.0" + p-map-series "^1.0.0" + tempfile "^2.0.0" + +bin-check@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz#fc495970bdc88bb1d5a35fc17e65c4a149fc4a49" + integrity sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA== + dependencies: + execa "^0.7.0" + executable "^4.1.0" + +bin-version-check@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-4.0.0.tgz#7d819c62496991f80d893e6e02a3032361608f71" + integrity sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ== + dependencies: + bin-version "^3.0.0" + semver "^5.6.0" + semver-truncate "^1.1.2" + +bin-version@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-3.1.0.tgz#5b09eb280752b1bd28f0c9db3f96f2f43b6c0839" + integrity sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ== + dependencies: + execa "^1.0.0" + find-versions "^3.0.0" + +bin-wrapper@^4.0.0, bin-wrapper@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605" + integrity sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q== + dependencies: + bin-check "^4.1.0" + bin-version-check "^4.0.0" + download "^7.1.0" + import-lazy "^3.1.0" + os-filter-obj "^2.0.0" + pify "^4.0.1" + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +bl@^1.0.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7" + integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +bn.js@^5.0.0, bn.js@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== + +body-parser@^1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +boolbase@^1.0.0, boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +bootstrap-datepicker@^1.8.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz#e4bfce3fcce1967876b21dc6833ec5994aaed090" + integrity sha512-9rYYbaVOheGYxjOr/+bJCmRPihfy+LkLSg4fIFMT9Od8WwWB/MB50w0JO1eBgKUMbb7PFHQD5uAfI3ArAxZRXA== + dependencies: + jquery ">=1.7.1 <4.0.0" + +bootstrap4-toggle@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/bootstrap4-toggle/-/bootstrap4-toggle-3.6.1.tgz#867f2c350727022e6358ec0d43e43b7cfb609f74" + integrity sha512-eRejcTc9YurhZ64nHY9Ii9DQn+F9/R74H9RPoeANVM3N1+C2lZ2tUuFCx1w3orOJ1y/iG4A7iCwdDZphMDIrYg== + +bootstrap@^4.3.1, bootstrap@^4.5.2: + version "4.6.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" + integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +brorand@^1.0.1, brorand@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + +browser-pack@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774" + integrity sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA== + dependencies: + JSONStream "^1.0.3" + combine-source-map "~0.8.0" + defined "^1.0.0" + safe-buffer "^5.1.1" + through2 "^2.0.0" + umd "^3.0.0" + +browser-resolve@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-2.0.0.tgz#99b7304cb392f8d73dba741bb2d7da28c6d7842b" + integrity sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ== + dependencies: + resolve "^1.17.0" + +browserfs@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/browserfs/-/browserfs-1.4.3.tgz#92ffc6063967612daccdb8566d3fc03f521205fb" + integrity sha512-tz8HClVrzTJshcyIu8frE15cjqjcBIu15Bezxsvl/i+6f59iNCN3kznlWjz0FEb3DlnDx3gW5szxeT6D1x0s0w== + dependencies: + async "^2.1.4" + pako "^1.0.4" + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +browserify-cipher@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" + integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" + integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + dependencies: + bn.js "^5.0.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +browserify-zlib@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== + dependencies: + pako "~1.0.5" + +browserify@^17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-17.0.0.tgz#4c48fed6c02bfa2b51fd3b670fddb805723cdc22" + integrity sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w== + dependencies: + JSONStream "^1.0.3" + assert "^1.4.0" + browser-pack "^6.0.1" + browser-resolve "^2.0.0" + browserify-zlib "~0.2.0" + buffer "~5.2.1" + cached-path-relative "^1.0.0" + concat-stream "^1.6.0" + console-browserify "^1.1.0" + constants-browserify "~1.0.0" + crypto-browserify "^3.0.0" + defined "^1.0.0" + deps-sort "^2.0.1" + domain-browser "^1.2.0" + duplexer2 "~0.1.2" + events "^3.0.0" + glob "^7.1.0" + has "^1.0.0" + htmlescape "^1.1.0" + https-browserify "^1.0.0" + inherits "~2.0.1" + insert-module-globals "^7.2.1" + labeled-stream-splicer "^2.0.0" + mkdirp-classic "^0.5.2" + module-deps "^6.2.3" + os-browserify "~0.3.0" + parents "^1.0.1" + path-browserify "^1.0.0" + process "~0.11.0" + punycode "^1.3.2" + querystring-es3 "~0.2.0" + read-only-stream "^2.0.0" + readable-stream "^2.0.2" + resolve "^1.1.4" + shasum-object "^1.0.0" + shell-quote "^1.6.1" + stream-browserify "^3.0.0" + stream-http "^3.0.0" + string_decoder "^1.1.1" + subarg "^1.0.0" + syntax-error "^1.1.1" + through2 "^2.0.0" + timers-browserify "^1.0.1" + tty-browserify "0.0.1" + url "~0.11.0" + util "~0.12.0" + vm-browserify "^1.0.0" + xtend "^4.0.0" + +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.3, browserslist@^4.16.6: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== + dependencies: + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" + escalade "^3.1.1" + node-releases "^1.1.71" + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + +buffer@^5.2.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + +buffer@~5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6" + integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + +bufferstreams@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-3.0.0.tgz#d2cb186cffeb527668341891e523c19539bc4a14" + integrity sha512-Qg0ggJUWJq90vtg4lDsGN9CDWvzBMQxhiEkSOD/sJfYt6BLect3eV1/S6K7SCSKJ34n60rf6U5eUPmQENVE4UA== + dependencies: + readable-stream "^3.4.0" + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cacache@^15.2.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== + dependencies: + "@npmcli/fs" "^1.0.0" + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" + unique-filename "^1.1.1" + +cacheable-request@^2.1.1: + version "2.1.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d" + integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= + dependencies: + clone-response "1.0.2" + get-stream "3.0.0" + http-cache-semantics "3.8.1" + keyv "3.0.0" + lowercase-keys "1.0.0" + normalize-url "2.0.1" + responselike "1.0.2" + +cached-path-relative@^1.0.0, cached-path-relative@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3" + integrity sha1-hlV23+85wNan3v3nlNB49TCOPvM= + +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +camelize@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" + integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== + dependencies: + browserslist "^4.0.0" + caniuse-lite "^1.0.0" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001230: + version "1.0.30001230" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71" + integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ== + +caw@^2.0.0, caw@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95" + integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA== + dependencies: + get-proxy "^2.0.0" + isurl "^1.0.0-alpha5" + tunnel-agent "^0.6.0" + url-to-options "^1.0.1" + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chart.js@^2.9.3: + version "2.9.4" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684" + integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A== + dependencies: + chartjs-color "^2.1.0" + moment "^2.10.2" + +chartjs-color-string@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" + integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A== + dependencies: + color-name "^1.0.0" + +chartjs-color@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0" + integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w== + dependencies: + chartjs-color-string "^0.6.0" + color-convert "^1.9.3" + +cheerio-select@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz#3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9" + integrity sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew== + dependencies: + css-select "^4.1.2" + css-what "^5.0.0" + domelementtype "^2.2.0" + domhandler "^4.2.0" + domutils "^2.6.0" + +cheerio@^1.0.0-rc.3: + version "1.0.0-rc.9" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz#a3ae6b7ce7af80675302ff836f628e7cb786a67f" + integrity sha512-QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng== + dependencies: + cheerio-select "^1.4.0" + dom-serializer "^1.3.1" + domhandler "^4.2.0" + htmlparser2 "^6.1.0" + parse5 "^6.0.1" + parse5-htmlparser2-tree-adapter "^6.0.1" + tslib "^2.2.0" + +"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.2: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +circular-json-es6@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/circular-json-es6/-/circular-json-es6-2.0.2.tgz#e4f4a093e49fb4b6aba1157365746112a78bd344" + integrity sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ== + +classnames@*, classnames@^2.2.5, classnames@^2.2.6: + version "2.3.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +closest@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz#26da6f80b3e0e17e71f80f12782819e9f653495c" + integrity sha1-JtpvgLPg4X5x+A8SeCgZ6fZTSVw= + dependencies: + matches-selector "0.0.1" + +clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + +coa@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== + dependencies: + "@types/q" "^1.5.1" + chalk "^2.4.1" + q "^1.1.2" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +codemirror@^5.59.2: + version "5.59.4" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.59.4.tgz#bfc11c8ce32b04818e8d661bbd790a94f4b3a6f3" + integrity sha512-achw5JBgx8QPcACDDn+EUUXmCYzx/zxEtOGXyjvLEvYY8GleUrnfm5D+Zb+UjShHggXKDT9AXrbkBZX6a0YSQg== + +color-convert@^1.9.0, color-convert@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colord@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.0.0.tgz#f8c19f2526b7dc5b22d6e57ef102f03a2a43a3d8" + integrity sha512-WMDFJfoY3wqPZNpKUFdse3HhD5BHCbE9JCdxRzoVH+ywRITGOeWAHNkGEmyxLlErEpN9OLMWgdM9dWQtDk5dog== + +colorette@^1.2.1, colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +colors@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +combine-source-map@^0.8.0, combine-source-map@~0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" + integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= + dependencies: + convert-source-map "~1.1.0" + inline-source-map "~0.6.0" + lodash.memoize "~3.0.3" + source-map "~0.5.3" + +commander@^2.19.0, commander@^2.20.0, commander@^2.8.1: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + +commander@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + +commander@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" + integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + +commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + +component-emitter@~1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.12" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" + integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +connect@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== + dependencies: + debug "2.6.9" + finalhandler "1.1.2" + parseurl "~1.3.3" + utils-merge "1.0.1" + +console-browserify@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +constants-browserify@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + +content-disposition@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +context-menu@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz#565f13210248e3442700e6b1a2d63406f2b08552" + integrity sha512-VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg== + dependencies: + tiny-emitter "^2.0.2" + +convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +convert-source-map@~1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" + integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= + +cookie@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + +copy-webpack-plugin@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-7.0.0.tgz#3506f867ca6e861ee2769d4deaf8fa0d2563ada9" + integrity sha512-SLjQNa5iE3BoCP76ESU9qYo9ZkEWtXoZxDurHoqPchAFRblJ9g96xTeC560UXBMre1Nx6ixIIUfiY3VcjpJw3g== + dependencies: + fast-glob "^3.2.4" + glob-parent "^5.1.1" + globby "^11.0.1" + loader-utils "^2.0.0" + normalize-path "^3.0.0" + p-limit "^3.0.2" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + +core-js-compat@^3.8.1, core-js-compat@^3.9.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455" + integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA== + dependencies: + browserslist "^4.16.3" + semver "7.0.0" + +core-js@^2.4.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +core-js@^3.12.1, core-js@^3.2.1: + version "3.12.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112" + integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw== + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cors@~2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +create-ecdh@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== + dependencies: + bn.js "^4.1.0" + elliptic "^6.5.3" + +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-browserify@^3.0.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + randomfill "^1.0.3" + +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= + +css-color-names@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" + integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= + +css-color-names@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" + integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== + +css-declaration-sorter@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.0.3.tgz#9dfd8ea0df4cc7846827876fafb52314890c21a9" + integrity sha512-52P95mvW1SMzuRZegvpluT6yEv0FqQusydKQPZsNN5Q7hh8EwQvN8E2nwuJ16BBvNN6LcoIZXu/Bk58DAhrrxw== + dependencies: + timsort "^0.3.0" + +css-line-break@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef" + integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA== + dependencies: + base64-arraybuffer "^0.2.0" + +css-loader@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.1.1.tgz#9362d444a0f7c08c148a109596715c904e252879" + integrity sha512-5FfhpjwtuRgxqmusDidowqmLlcb+1HgnEDMsi2JhiUrZUcoc+cqw+mUtMIF/+OfeMYaaFCLYp1TaIt9H6I/fKA== + dependencies: + camelcase "^6.2.0" + cssesc "^3.0.0" + icss-utils "^5.1.0" + loader-utils "^2.0.0" + postcss "^8.2.6" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.1.0" + schema-utils "^3.0.0" + semver "^7.3.4" + +css-minimizer-webpack-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.0.tgz#5b1edbffe1a3e6450d8cb53fb4f4c5013b7af313" + integrity sha512-yIrqG0pPphR1RoNx2wDxYmxRf2ubRChLDXxv7ccipEm5bRKsZRYp8n+2peeXehtTF5s3yNxlqsdz3WQOsAgUkw== + dependencies: + cssnano "^5.0.0" + jest-worker "^26.3.0" + p-limit "^3.0.2" + postcss "^8.2.9" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + +css-select-base-adapter@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== + +css-select@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== + dependencies: + boolbase "^1.0.0" + css-what "^3.2.1" + domutils "^1.7.0" + nth-check "^1.0.2" + +css-select@^4.1.2, css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + +css-to-react-native@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" + integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + +css-tree@1.0.0-alpha.37: + version "1.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== + dependencies: + mdn-data "2.0.4" + source-map "^0.6.1" + +css-tree@^1.1.2, css-tree@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +css-vendor@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" + integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== + dependencies: + "@babel/runtime" "^7.8.3" + is-in-browser "^1.0.2" + +css-what@^3.2.1: + version "3.4.2" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== + +css-what@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssnano-preset-default@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.1.tgz#5cd783caed942cc94159aeb10583af4691445b8c" + integrity sha512-kAhR71Tascmnjlhl4UegGA3KGGbMLXHkkqVpA9idsRT1JmIhIsz1C3tDpBeQMUw5EX5Rfb1HGc/PRqD2AFk3Vg== + dependencies: + css-declaration-sorter "^6.0.3" + cssnano-utils "^2.0.1" + postcss-calc "^8.0.0" + postcss-colormin "^5.1.1" + postcss-convert-values "^5.0.1" + postcss-discard-comments "^5.0.1" + postcss-discard-duplicates "^5.0.1" + postcss-discard-empty "^5.0.1" + postcss-discard-overridden "^5.0.1" + postcss-merge-longhand "^5.0.2" + postcss-merge-rules "^5.0.1" + postcss-minify-font-values "^5.0.1" + postcss-minify-gradients "^5.0.1" + postcss-minify-params "^5.0.1" + postcss-minify-selectors "^5.1.0" + postcss-normalize-charset "^5.0.1" + postcss-normalize-display-values "^5.0.1" + postcss-normalize-positions "^5.0.1" + postcss-normalize-repeat-style "^5.0.1" + postcss-normalize-string "^5.0.1" + postcss-normalize-timing-functions "^5.0.1" + postcss-normalize-unicode "^5.0.1" + postcss-normalize-url "^5.0.1" + postcss-normalize-whitespace "^5.0.1" + postcss-ordered-values "^5.0.1" + postcss-reduce-initial "^5.0.1" + postcss-reduce-transforms "^5.0.1" + postcss-svgo "^5.0.1" + postcss-unique-selectors "^5.0.1" + +cssnano-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" + integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== + +cssnano@^5.0.0, cssnano@^5.0.2: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.4.tgz#5ca90729c94c71c4bc3d45abb543be10740bf381" + integrity sha512-I+fDW74CJ4yb31765ov9xXe70XLZvFTXjwhmA//VgAAuSAU34Oblbe94Q9zffiCX1VhcSfQWARQnwhz+Nqgb4Q== + dependencies: + cosmiconfig "^7.0.0" + cssnano-preset-default "^5.1.1" + is-resolvable "^1.1.0" + +csso@^4.0.2, csso@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== + dependencies: + css-tree "^1.1.2" + +csstype@^2.5.2, csstype@^2.5.7: + version "2.6.16" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" + integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== + +csstype@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== + +cubic2quad@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" + integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== + +custom-event@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" + integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU= + +dagre@^0.8.4: + version "0.8.5" + resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" + integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== + dependencies: + graphlib "^2.1.8" + lodash "^4.17.15" + +dash-ast@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37" + integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== + +date-fns@^2.24.0: + version "2.24.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d" + integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw== + +date-format@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz#f63de5dc08dc02efd8ef32bf2a6918e486f35873" + integrity sha1-9j3l3AjcAu/Y7zK/KmkY5IbzWHM= + +debug@2.6.9, debug@^2.6.8: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha1-BCZuC3CpjURi5uKI44JZITMytmQ= + dependencies: + ms "2.1.2" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +decompress-response@^3.2.0, decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" + integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== + dependencies: + file-type "^5.2.0" + is-stream "^1.1.0" + tar-stream "^1.5.2" + +decompress-tarbz2@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" + integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== + dependencies: + decompress-tar "^4.1.0" + file-type "^6.1.0" + is-stream "^1.1.0" + seek-bzip "^1.0.5" + unbzip2-stream "^1.0.9" + +decompress-targz@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" + integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== + dependencies: + decompress-tar "^4.1.1" + file-type "^5.2.0" + is-stream "^1.1.0" + +decompress-unzip@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" + integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k= + dependencies: + file-type "^3.8.0" + get-stream "^2.2.0" + pify "^2.3.0" + yauzl "^2.4.2" + +decompress@^4.0.0, decompress@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118" + integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== + dependencies: + decompress-tar "^4.0.0" + decompress-tarbz2 "^4.0.0" + decompress-targz "^4.0.0" + decompress-unzip "^4.0.1" + graceful-fs "^4.1.10" + make-dir "^1.0.0" + pify "^2.3.0" + strip-dirs "^2.0.0" + +deep-diff@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26" + integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg== + +deep-equal-ident@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz#06f4b89e53710cd6cea4a7781c7a956642de8dc9" + integrity sha1-BvS4nlNxDNbOpKd4HHqVZkLejck= + dependencies: + lodash.isequal "^3.0" + +deep-is@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +defined@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@^1.1.2, depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +deps-sort@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz#9dfdc876d2bcec3386b6829ac52162cda9fa208d" + integrity sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw== + dependencies: + JSONStream "^1.0.3" + shasum-object "^1.0.0" + subarg "^1.0.0" + through2 "^2.0.0" + +des.js@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +detect-indent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" + integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + dependencies: + repeating "^2.0.0" + +detective@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== + dependencies: + acorn-node "^1.6.1" + defined "^1.0.0" + minimist "^1.1.1" + +di@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" + integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= + +diff-arrays-of-objects@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/diff-arrays-of-objects/-/diff-arrays-of-objects-1.1.8.tgz#a5b008bb409af7c7f997f0064e312df0d5a1bb24" + integrity sha512-OAaiDlQRiv5+EASUpwNSDa/sWyKHKvODQfah1CAx0dosR8OWXedFXgxAQHIdeWDobZ86D6g93BfK2X9ECIRuqw== + dependencies: + deep-diff "^1.0.2" + lodash "^4.17.19" + +diffie-hellman@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dom-helpers@^5.0.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" + integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + +dom-serialize@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" + integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs= + dependencies: + custom-event "~1.0.0" + ent "~2.2.0" + extend "^3.0.0" + void-elements "^2.0.0" + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +dom-serializer@^1.0.1, dom-serializer@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domain-browser@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== + +domelementtype@1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domhandler@4.2.0, domhandler@^4.0.0, domhandler@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" + integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== + dependencies: + domelementtype "^2.2.0" + +domutils@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +domutils@^2.5.2, domutils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7" + integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +download@^6.2.2: + version "6.2.5" + resolved "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714" + integrity sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA== + dependencies: + caw "^2.0.0" + content-disposition "^0.5.2" + decompress "^4.0.0" + ext-name "^5.0.0" + file-type "5.2.0" + filenamify "^2.0.0" + get-stream "^3.0.0" + got "^7.0.0" + make-dir "^1.0.0" + p-event "^1.0.0" + pify "^3.0.0" + +download@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233" + integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ== + dependencies: + archive-type "^4.0.0" + caw "^2.0.1" + content-disposition "^0.5.2" + decompress "^4.2.0" + ext-name "^5.0.0" + file-type "^8.1.0" + filenamify "^2.0.0" + get-stream "^3.0.0" + got "^8.3.1" + make-dir "^1.2.0" + p-event "^2.1.0" + pify "^3.0.0" + +dropzone@^5.9.3: + version "5.9.3" + resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" + integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== + +duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +duplexer@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +ejs@~3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + dependencies: + jake "^10.6.1" + +electron-to-chromium@^1.3.723: + version "1.3.740" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz#e38b7d2b848f632191b643e6dabca51be2162922" + integrity sha512-Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg== + +elliptic@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== + dependencies: + bn.js "^4.11.9" + brorand "^1.1.0" + hash.js "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +engine.io-client@~5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-5.1.1.tgz#f5c3aaaef1bdc9443aac6ffde48b3b2fb2dc56fc" + integrity sha512-jPFpw2HLL0lhZ2KY0BpZhIJdleQcUO9W1xkIpo0h3d6s+5D6+EV/xgQw9qWOmymszv2WXef/6KUUehyxEKomlQ== + dependencies: + base64-arraybuffer "0.1.4" + component-emitter "~1.3.0" + debug "~4.3.1" + engine.io-parser "~4.0.1" + has-cors "1.1.0" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~7.4.2" + yeast "0.1.2" + +engine.io-parser@~4.0.0, engine.io-parser@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" + integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== + dependencies: + base64-arraybuffer "0.1.4" + +engine.io@~4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.2.tgz#f96ceb56d4b39cc7ca5bd29a20e9c99c1ad1a765" + integrity sha1-+WzrVtSznMfKW9KaIOnJnBrRp2U= + dependencies: + accepts "~1.3.4" + base64id "2.0.0" + cookie "~0.4.1" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~4.0.0" + ws "~7.4.2" + +enhanced-resolve@^5.7.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +ent@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +enzyme-adapter-utils@^1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0" + integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg== + dependencies: + airbnb-prop-types "^2.16.0" + function.prototype.name "^1.1.3" + has "^1.0.3" + object.assign "^4.1.2" + object.fromentries "^2.0.3" + prop-types "^15.7.2" + semver "^5.7.1" + +enzyme-matchers@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-7.1.2.tgz#d80530a61f22d28bb993dd7588abba38bd4de282" + integrity sha512-03WqAg2XDl7id9rARIO97HQ1JIw9F2heJ3R4meGu/13hx0ULTDEgl0E67MGl2Uq1jq1DyRnJfto1/VSzskdV5A== + dependencies: + circular-json-es6 "^2.0.1" + deep-equal-ident "^1.1.1" + +enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e" + integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q== + dependencies: + has "^1.0.3" + object-is "^1.1.2" + +enzyme@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28" + integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw== + dependencies: + array.prototype.flat "^1.2.3" + cheerio "^1.0.0-rc.3" + enzyme-shallow-equal "^1.0.1" + function.prototype.name "^1.1.2" + has "^1.0.3" + html-element-map "^1.2.0" + is-boolean-object "^1.0.1" + is-callable "^1.1.5" + is-number-object "^1.0.4" + is-regex "^1.0.5" + is-string "^1.0.5" + is-subset "^0.1.1" + lodash.escape "^4.0.1" + lodash.isequal "^4.5.0" + object-inspect "^1.7.0" + object-is "^1.0.2" + object.assign "^4.1.0" + object.entries "^1.1.1" + object.values "^1.1.1" + raf "^3.4.1" + rst-selector-parser "^2.2.3" + string.prototype.trim "^1.2.1" + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.2.tgz#6eb518b640262e8ddcbd48e0bc8549f82efd48a7" + integrity sha512-byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.2" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.10.3" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-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-module-lexer@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" + integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +eslint-plugin-react-hooks@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== + +eslint-plugin-react@^7.20.5: + version "7.23.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz#2d2291b0f95c03728b55869f01102290e792d494" + integrity sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw== + dependencies: + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" + doctrine "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.3" + object.fromentries "^2.0.4" + object.values "^1.1.3" + prop-types "^15.7.2" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.4" + +eslint-rule-composer@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" + integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== + +eslint-scope@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" + integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint@^7.19.0: + version "7.21.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" + integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash "^4.17.20" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.4" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.1.0, esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +eve@~0.5.1: + version "0.5.4" + resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" + integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o= + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.0.0, events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +exec-buffer@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.2.0.tgz#b1686dbd904c7cf982e652c1f5a79b1e5573082b" + integrity sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA== + dependencies: + execa "^0.7.0" + p-finally "^1.0.0" + pify "^3.0.0" + rimraf "^2.5.4" + tempfile "^2.0.0" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +execa@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +executable@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" + integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg== + dependencies: + pify "^2.2.0" + +exports-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-2.0.0.tgz#ca7861b86726997bb4e55001888d2af940935979" + integrity sha512-k/VFrVEUmotfkk8vZ+njG5NEXpr5Ee+BonV+AYINV2hNo3o+/UB8nEuCUQk2k6IyWIoobmXoTFO0igxrQcMV4Q== + dependencies: + source-map "^0.6.1" + +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +fast-deep-equal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.4: + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-safe-stringify@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" + integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + +fast-xml-parser@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" + integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastq@^1.6.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + dependencies: + reusify "^1.0.4" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +file-type@5.2.0, file-type@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" + integrity sha1-LdvqfHP/42No365J3DOMBYwritY= + +file-type@^12.0.0: + version "12.4.2" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9" + integrity sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg== + +file-type@^3.8.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= + +file-type@^4.2.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5" + integrity sha1-G2AOX8ofvcboDApwxxyNul95BsU= + +file-type@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" + integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== + +file-type@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c" + integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ== + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filelist@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + dependencies: + minimatch "^3.0.4" + +filename-reserved-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" + integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= + +filenamify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9" + integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA== + dependencies: + filename-reserved-regex "^2.0.0" + strip-outer "^1.0.0" + trim-repeated "^1.0.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-cache-dir@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-versions@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" + integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww== + dependencies: + semver-regex "^2.0.0" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + +flatted@^3.2.4: + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha1-dshYT0/IQ9tkcCpr0Eq3qL1mbaM= + +follow-redirects@^1.0.0, follow-redirects@^1.14.0: + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + +foreach@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + +fraction.js@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz#ac4e520473dae67012d618aab91eda09bcb400ff" + integrity sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg== + +from2@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E= + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz#e4ea839b9d3672ae99d0efd9f38d9191c5eaac83" + integrity sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + functions-have-names "^1.2.2" + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +functions-have-names@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" + integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +geometry-interfaces@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz#9e82af6700ca639a675299f08e1f5fbc4a79d48d" + integrity sha512-qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA== + +get-assigned-identifiers@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1" + integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-proxy@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" + integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw== + dependencies: + npm-conf "^1.1.0" + +get-stream@3.0.0, get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= + +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.1.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== + +globby@^10.0.0: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + +globby@^11.0.1: + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +got@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" + integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== + dependencies: + decompress-response "^3.2.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-plain-obj "^1.1.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + isurl "^1.0.0-alpha5" + lowercase-keys "^1.0.0" + p-cancelable "^0.3.0" + p-timeout "^1.1.1" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + url-parse-lax "^1.0.0" + url-to-options "^1.0.1" + +got@^8.3.1: + version "8.3.2" + resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" + integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw== + dependencies: + "@sindresorhus/is" "^0.7.0" + cacheable-request "^2.1.1" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + into-stream "^3.1.0" + is-retry-allowed "^1.1.0" + isurl "^1.0.0-alpha5" + lowercase-keys "^1.0.0" + mimic-response "^1.0.0" + p-cancelable "^0.4.0" + p-timeout "^2.0.1" + pify "^3.0.0" + safe-buffer "^5.1.1" + timed-out "^4.0.1" + url-parse-lax "^3.0.0" + url-to-options "^1.0.1" + +graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +graphlib@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" + integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== + dependencies: + lodash "^4.17.15" + +gzip-size@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== + dependencies: + duplexer "^0.1.2" + +handlebars@^4.0.11: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-cors@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbol-support-x@^1.4.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" + integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-to-string-tag-x@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" + integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== + dependencies: + has-symbol-support-x "^1.4.1" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has@^1.0.0, has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== + dependencies: + inherits "^2.0.3" + minimalistic-assert "^1.0.1" + +hat@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" + integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo= + +heap@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz#713b65590ebcc40fcbeeaf55e851694092b39af1" + integrity sha1-cTtlWQ68xA/L7q9V6FFpQJKzmvE= + +hex-color-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" + integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== + +hmac-drbg@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + +hsl-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" + integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= + +hsla-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" + integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= + +html-dom-parser@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-1.0.1.tgz#5d147fed6656c12918edbcea4a423eefe8d0e715" + integrity sha512-uKXISKlHzB/l9A08jrs2wseQJ9b864ZfEdmIZskj10cuP6HxCOMHSK0RdluV8NVQaWs0PwefN7d8wqG3jR0IbQ== + dependencies: + domhandler "4.2.0" + htmlparser2 "6.1.0" + +html-element-map@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08" + integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg== + dependencies: + array.prototype.filter "^1.0.0" + call-bind "^1.0.2" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +html-react-parser@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-1.2.7.tgz#1674ed4b96b3440ad922962a3ff000e7f3325293" + integrity sha512-gUUEgrZV0YaCxtZO2XuJDUnHSq7gOqKu1krye97cxgiZ+ipaIzspGMhATeq9lhy9gwYmwBF2YCHe/accrMMo8Q== + dependencies: + domhandler "4.2.0" + html-dom-parser "1.0.1" + react-property "1.0.1" + style-to-js "1.1.0" + +html2canvas@^1.0.0-rc.7: + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98" + integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA== + dependencies: + css-line-break "1.1.1" + +htmlescape@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" + integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= + +htmlparser2@6.1.0, htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + +http-cache-semantics@3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + +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== + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + dependencies: + ms "^2.0.0" + +hyphenate-style-name@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" + integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== + +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.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +ignore@^5.1.1, ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +image-minimizer-webpack-plugin@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-2.2.0.tgz#6d6d2d21424aa1b690d2e40a044bd9cd334e42ad" + integrity sha512-/BpKvjbfj9A+au7FryzHmj+1g3h2NzQ0w4nrXTU5YcQIGotvG69A5xyFL9Mq1htI9E8dI4rMF/wUc0klZLb1pg== + dependencies: + imagemin "^7.0.1" + klona "^2.0.4" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + +imagemin-mozjpeg@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-9.0.0.tgz#d1af26d0b43d75a41c211051c1910da59d9d2324" + integrity sha512-TwOjTzYqCFRgROTWpVSt5UTT0JeCuzF1jswPLKALDd89+PmrJ2PdMMYeDLYZ1fs9cTovI9GJd68mRSnuVt691w== + dependencies: + execa "^4.0.0" + is-jpg "^2.0.0" + mozjpeg "^7.0.0" + +imagemin-optipng@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-8.0.0.tgz#b88e5cf6da25cc8479e07cdf38c3ae0479df7ef2" + integrity sha512-CUGfhfwqlPjAC0rm8Fy+R2DJDBGjzy2SkfyT09L8rasnF9jSoHFqJ1xxSZWK6HVPZBMhGPMxCTL70OgTHlLF5A== + dependencies: + exec-buffer "^3.0.0" + is-png "^2.0.0" + optipng-bin "^7.0.0" + +imagemin-pngquant@^9.0.1: + version "9.0.2" + resolved "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-9.0.2.tgz#38155702b0cc4f60f671ba7c2b086ea3805d9567" + integrity sha512-cj//bKo8+Frd/DM8l6Pg9pws1pnDUjgb7ae++sUX1kUVdv2nrngPykhiUOgFeE0LGY/LmUbCf4egCHC4YUcZSg== + dependencies: + execa "^4.0.0" + is-png "^2.0.0" + is-stream "^2.0.0" + ow "^0.17.0" + pngquant-bin "^6.0.0" + +imagemin-svgo@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-8.0.0.tgz#34658069f9e4a537e455467b433830fffaeb3c6e" + integrity sha512-++fDnnxsLT+4rpt8babwiIbzapgBzeS2Kgcy+CwgBvgSRFltBFhX2WnpCziMtxhRCzqJcCE9EcHWZP/sj+G3rQ== + dependencies: + is-svg "^4.2.1" + svgo "^1.3.2" + +imagemin@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.1.tgz#f6441ca647197632e23db7d971fffbd530c87dbf" + integrity sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w== + dependencies: + file-type "^12.0.0" + globby "^10.0.0" + graceful-fs "^4.2.2" + junk "^3.1.0" + make-dir "^3.0.0" + p-pipe "^3.0.0" + replace-ext "^1.0.0" + +immutability-helper@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz#2b86b2286ed3b1241c9e23b7b21e0444f52f77b7" + integrity sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ== + +import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc" + integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ== + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imports-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-2.0.0.tgz#f2f5152c6d8798a286b28a44eeae62142b60aa2c" + integrity sha512-ZwEx0GfsJ1QckGqHSS1uu1sjpUgT3AYFOr3nT07dVnfeyc/bOICSw48067hr0u7DW8TZVzNVvdnvA62U9lG8nQ== + dependencies: + loader-utils "^2.0.0" + source-map "^0.6.1" + strip-comments "^2.0.1" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indefinite-observable@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz#574af29bfbc17eb5947793797bddc94c9d859400" + integrity sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ== + dependencies: + symbol-observable "1.2.0" + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inline-source-map@~0.6.0: + version "0.6.2" + resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" + integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= + dependencies: + source-map "~0.5.3" + +inline-style-parser@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" + integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== + +insert-if@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/insert-if/-/insert-if-1.2.0.tgz#5b878ead294a727eb75598ef8cf9244f33e17157" + integrity sha512-UFXvgVVosbyfa7tsowU8nOLHp/fGe7oGi5vYMy9wEQio8olkf+P7sHssmYnUe991du5EDlD+n/5cW17WgM7Cog== + +insert-module-globals@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz#d5e33185181a4e1f33b15f7bf100ee91890d5cb3" + integrity sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg== + dependencies: + JSONStream "^1.0.3" + acorn-node "^1.5.2" + combine-source-map "^0.8.0" + concat-stream "^1.6.1" + is-buffer "^1.1.0" + path-is-absolute "^1.0.1" + process "~0.11.0" + through2 "^2.0.0" + undeclared-identifiers "^1.1.2" + xtend "^4.0.0" + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + +into-stream@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" + integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= + dependencies: + from2 "^2.1.1" + p-is-promise "^1.1.0" + +invariant@^2.2.2: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +ip-address@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-7.1.0.tgz#4a9c699e75b51cbeb18b38de8ed216efa1a490c5" + integrity sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ== + dependencies: + jsbn "1.1.0" + sprintf-js "1.1.2" + +ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== + +is-any-array@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-1.0.0.tgz#bcb2c7e2d28aaa2fa02ee8f6b604b0b3a957bba7" + integrity sha512-0o0ZsgObnylv72nO39P6M+PL7jPUEx39O6BEfZuX36IKPy/RpdudxluAIaRn/LZi5eVPDMlMBaLABzOK6bwPlw== + +is-arguments@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" + integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + dependencies: + call-bind "^1.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-bigint@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" + integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.0.1, is-boolean-object@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" + integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + dependencies: + call-bind "^1.0.0" + +is-buffer@^1.1.0: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-buffer@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== + +is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + +is-color-stop@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" + integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= + dependencies: + css-color-names "^0.0.4" + hex-color-regex "^1.1.0" + hsl-regex "^1.0.0" + hsla-regex "^1.0.0" + rgb-regex "^1.0.1" + rgba-regex "^1.0.0" + +is-core-module@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + dependencies: + has "^1.0.3" + +is-date-object@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + +is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-function@^1.0.7: + version "1.0.9" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz#e5f82c2323673e7fcad3d12858c83c4039f6399c" + integrity sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A== + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-in-browser@^1.0.2, is-in-browser@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" + integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= + +is-jpg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97" + integrity sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc= + +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + +is-natural-number@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" + integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= + +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + +is-number-object@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" + integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== + +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-png@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d" + integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g== + +is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== + dependencies: + call-bind "^1.0.2" + has-symbols "^1.0.2" + +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + +is-resolvable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== + +is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" + integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== + +is-stream@^1.0.0, is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + +is-string@^1.0.5, is-string@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== + +is-subset@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" + integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= + +is-svg@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" + integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== + dependencies: + fast-xml-parser "^3.19.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + dependencies: + has-symbols "^1.0.1" + +is-typed-array@^1.1.3: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e" + integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.2" + es-abstract "^1.18.0-next.2" + foreach "^2.0.5" + has-symbols "^1.0.1" + +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" + integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== + dependencies: + unc-path-regex "^0.1.2" + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isbinaryfile@^4.0.6: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +istanbul-instrumenter-loader@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949" + integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w== + dependencies: + convert-source-map "^1.5.0" + istanbul-lib-instrument "^1.7.3" + loader-utils "^1.1.0" + schema-utils "^0.3.0" + +istanbul-lib-coverage@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0" + integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ== + +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-instrument@^1.7.3: + version "1.10.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca" + integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A== + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.18.0" + istanbul-lib-coverage "^1.2.1" + semver "^5.3.0" + +istanbul-lib-instrument@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + +isurl@^1.0.0-alpha5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" + integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== + dependencies: + has-to-string-tag-x "^1.2.0" + is-object "^1.0.1" + +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + +jasmine-core@^3.6.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561" + integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ== + +jasmine-enzyme@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/jasmine-enzyme/-/jasmine-enzyme-7.1.2.tgz#a09ad4644841b2e402046dee5526253b961efa0f" + integrity sha512-4C9GeKgcJerRWBOt3nu9MAjjm5DK8kRbCBKLNWvDjbSfLWodomfjZA2lIpRcJkmof9tIfff2ZWa7DD53WLhyGA== + dependencies: + enzyme-matchers "^7.1.2" + +javascript-natural-sort@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" + integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k= + +jest-worker@^26.3.0, jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jmespath@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + +jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: + version "2.9.2" + resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced" + integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw== + dependencies: + jquery "^3.5.0" + +jquery-ui@>=1.8.0, jquery-ui@^1.13.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz#ab5ac65f37ca093c51b3478c4097f55bbc008f36" + integrity sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw== + dependencies: + jquery ">=1.8.0 <4.0.0" + +jquery@>=1.2.6, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.5.1, jquery@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" + integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== + +js-string-escape@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" + integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8= + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" + integrity sha1-sBMHyym2GKHtJux56RH4A8TaAEA= + +jsesc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" + integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-bignumber@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-bignumber/-/json-bignumber-1.0.2.tgz#c4b46a5230693b923f4f7bce6cbbdc777ae821ad" + integrity sha512-CfvvCybXLMo3+ZW4gkSOM1OF+f6rWTeZ5AZvYHcmcEPzK0z4EDR9XrdQoARGoozw3+qdS4DLe+Q/et4NstxrNA== + dependencies: + bignumber.js "^7.2.1" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/json-source-map/-/json-source-map-0.6.1.tgz#e0b1f6f4ce13a9ad57e2ae165a24d06e62c79a0f" + integrity sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + +json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsoneditor@^9.5.4: + version "9.5.6" + resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.5.6.tgz#b2abca2aeb34bb5291025d0eeddcb2845e0d90a9" + integrity sha512-smu4CKCOeJiizGGGYQ7ZAvCclnuJP7gX/wcoHw/DWiJMUZq+3KjJNDhYnVTRgi+Zk0UlPngA4egmuJre/H2mXg== + dependencies: + ace-builds "^1.4.12" + ajv "^6.12.6" + javascript-natural-sort "^0.7.1" + jmespath "^0.15.0" + json-source-map "^0.6.1" + jsonrepair "^2.2.1" + mobius1-selectr "^2.4.13" + picomodal "^3.0.0" + vanilla-picker "^2.11.2" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + +jsonrepair@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-2.2.1.tgz#7c6257c36550a310150c41ab7d5d4cab71828456" + integrity sha512-o9Je8TceILo872uQC9fIBJm957j1Io7z8Ca1iWIqY6S5S65HGE9XN7XEEw7+tUviB9Vq4sygV89MVTxl+rhZyg== + +jss-plugin-camel-case@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.5.1.tgz#427b24a9951b4c2eaa7e3d5267acd2e00b0934f9" + integrity sha512-9+oymA7wPtswm+zxVti1qiowC5q7bRdCJNORtns2JUj/QHp2QPXYwSNRD8+D2Cy3/CEMtdJzlNnt5aXmpS6NAg== + dependencies: + "@babel/runtime" "^7.3.1" + hyphenate-style-name "^1.0.3" + jss "10.5.1" + +jss-plugin-default-unit@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.5.1.tgz#2be385d71d50aee2ee81c2a9ac70e00592ed861b" + integrity sha512-D48hJBc9Tj3PusvlillHW8Fz0y/QqA7MNmTYDQaSB/7mTrCZjt7AVRROExoOHEtd2qIYKOYJW3Jc2agnvsXRlQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.5.1" + +jss-plugin-global@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.5.1.tgz#0e1793dea86c298360a7e2004721351653c7e764" + integrity sha512-jX4XpNgoaB8yPWw/gA1aPXJEoX0LNpvsROPvxlnYe+SE0JOhuvF7mA6dCkgpXBxfTWKJsno7cDSCgzHTocRjCQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.5.1" + +jss-plugin-nested@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.5.1.tgz#8753a80ad31190fb6ac6fdd39f57352dcf1295bb" + integrity sha512-xXkWKOCljuwHNjSYcXrCxBnjd8eJp90KVFW1rlhvKKRXnEKVD6vdKXYezk2a89uKAHckSvBvBoDGsfZrldWqqQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.5.1" + tiny-warning "^1.0.2" + +jss-plugin-props-sort@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.5.1.tgz#ab1c167fd2d4506fb6a1c1d66c5f3ef545ff1cd8" + integrity sha512-t+2vcevNmMg4U/jAuxlfjKt46D/jHzCPEjsjLRj/J56CvP7Iy03scsUP58Iw8mVnaV36xAUZH2CmAmAdo8994g== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.5.1" + +jss-plugin-rule-value-function@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.5.1.tgz#37f4030523fb3032c8801fab48c36c373004de7e" + integrity sha512-3gjrSxsy4ka/lGQsTDY8oYYtkt2esBvQiceGBB4PykXxHoGRz14tbCK31Zc6DHEnIeqsjMUGbq+wEly5UViStQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.5.1" + tiny-warning "^1.0.2" + +jss-plugin-vendor-prefixer@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.5.1.tgz#45a183a3a0eb097bdfab0986b858d99920c0bbd8" + integrity sha512-cLkH6RaPZWHa1TqSfd2vszNNgxT1W0omlSjAd6hCFHp3KIocSrW21gaHjlMU26JpTHwkc+tJTCQOmE/O1A4FKQ== + dependencies: + "@babel/runtime" "^7.3.1" + css-vendor "^2.0.8" + jss "10.5.1" + +jss@10.5.1, jss@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.5.1.tgz#93e6b2428c840408372d8b548c3f3c60fa601c40" + integrity sha512-hbbO3+FOTqVdd7ZUoTiwpHzKXIo5vGpMNbuXH1a0wubRSWLWSBvwvaq4CiHH/U42CmjOnp6lVNNs/l+Z7ZdDmg== + dependencies: + "@babel/runtime" "^7.3.1" + csstype "^3.0.2" + indefinite-observable "^2.0.1" + is-in-browser "^1.1.3" + tiny-warning "^1.0.2" + +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== + dependencies: + array-includes "^3.1.2" + object.assign "^4.1.2" + +junk@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" + integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== + +karma-babel-preprocessor@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.1.tgz#63b33cc7b5b3b5c7815ec453f7df58fb88345af1" + integrity sha512-5upyawNi3c7Gg6tPH1FWRVTmUijGf3v1GV4ScLM/2jKdDP18SlaKlUpu8eJrRI3STO8qK1bkqFcdgAA364nLYQ== + +karma-browserify@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-8.1.0.tgz#a200b15e2d93863cc704efe730722a5078b7d45b" + integrity sha512-q5OWuCfdXMfyhkRrH8XP5LiixD4lx0uCmlf6yQmGeQNHLH4Hoofur3tBJtSEhOXmY0mOdBe8ek2UUxicjmGqFQ== + dependencies: + convert-source-map "^1.8.0" + hat "^0.0.3" + js-string-escape "^1.0.0" + lodash "^4.17.21" + minimatch "^3.0.0" + os-shim "^0.1.3" + +karma-chrome-launcher@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738" + integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg== + dependencies: + which "^1.2.1" + +karma-coverage@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-2.0.3.tgz#c10f4711f4cf5caaaa668b1d6f642e7da122d973" + integrity sha512-atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g== + dependencies: + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.1" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.0" + minimatch "^3.0.4" + +karma-jasmine-html-reporter@^1.4.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz#586e17025a1b4128e9fba55d5f1e8921bfc3bc1e" + integrity sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw== + +karma-jasmine@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82" + integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw== + dependencies: + jasmine-core "^3.6.0" + +karma-requirejs@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798" + integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g= + +karma-source-map-support@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b" + integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A== + dependencies: + source-map-support "^0.5.5" + +karma-sourcemap-loader@^0.3.7: + version "0.3.8" + resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c" + integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g== + dependencies: + graceful-fs "^4.1.2" + +karma-webpack@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" + integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== + dependencies: + glob "^7.1.3" + minimatch "^3.0.4" + webpack-merge "^4.1.5" + +karma@^6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.2.tgz#24b62fbae3e8b5218cc32a0dac49ad08a541e76d" + integrity sha512-fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw== + dependencies: + body-parser "^1.19.0" + braces "^3.0.2" + chokidar "^3.4.2" + colors "^1.4.0" + connect "^3.7.0" + di "^0.0.1" + dom-serialize "^2.2.1" + glob "^7.1.6" + graceful-fs "^4.2.4" + http-proxy "^1.18.1" + isbinaryfile "^4.0.6" + lodash "^4.17.19" + log4js "^6.2.1" + mime "^2.4.5" + minimatch "^3.0.4" + qjobs "^1.2.0" + range-parser "^1.2.1" + rimraf "^3.0.2" + socket.io "^3.1.0" + source-map "^0.6.1" + tmp "0.2.1" + ua-parser-js "^0.7.23" + yargs "^16.1.1" + +keyv@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" + integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== + dependencies: + json-buffer "3.0.0" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +klona@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" + integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + +labeled-stream-splicer@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21" + integrity sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw== + dependencies: + inherits "^2.0.1" + stream-splicer "^2.0.0" + +leaflet@^1.5.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19" + integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + +loader-utils@^1.0.3, loader-utils@^1.1.0, loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash._baseisequal@^3.0.0: + version "3.0.7" + resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" + integrity sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE= + dependencies: + lodash.isarray "^3.0.0" + lodash.istypedarray "^3.0.0" + lodash.keys "^3.0.0" + +lodash._bindcallback@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" + integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= + +lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + +lodash.escape@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" + integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= + +lodash.flattendeep@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + +lodash.isarguments@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + +lodash.isarray@^3.0.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" + integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= + +lodash.isequal@^3.0: + version "3.0.4" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz#1c35eb3b6ef0cd1ff51743e3ea3cf7fdffdacb64" + integrity sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q= + dependencies: + lodash._baseisequal "^3.0.0" + lodash._bindcallback "^3.0.0" + +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + +lodash.istypedarray@^3.0.0: + version "3.0.6" + resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" + integrity sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I= + +lodash.keys@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" + integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= + dependencies: + lodash._getnative "^3.0.0" + lodash.isarguments "^3.0.0" + lodash.isarray "^3.0.0" + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.memoize@~3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" + integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@4.*, lodash@^4.14.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log4js@^6.2.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8" + integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg== + dependencies: + date-format "^4.0.3" + debug "^4.3.3" + flatted "^3.2.4" + rfdc "^1.3.0" + streamroller "^3.0.2" + +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lowercase-keys@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" + integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +lunr@^0.7.0: + version "0.7.2" + resolved "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz#79a30e932e216cba163541ee37a3607c12cd7281" + integrity sha1-eaMOky4hbLoWNUHuN6NgfBLNcoE= + +make-dir@^1.0.0, make-dir@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== + dependencies: + pify "^3.0.0" + +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-fetch-happen@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" + integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.2.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.2" + promise-retry "^2.0.1" + socks-proxy-agent "^6.0.0" + ssri "^8.0.0" + +marked@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.1.tgz#5e7ed7009bfa5c95182e4eb696f85e948cefcee3" + integrity sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw== + +matches-selector@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz#1df5262243ae341c1a0804dd302048267ac713bb" + integrity sha1-HfUmIkOuNBwaCATdMCBIJnrHE7s= + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.2.3, merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +microbuffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" + integrity sha1-izgy7UDIfVH0e7I0kTppinVtGdI= + +micromatch@^4.0.2: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +miller-rabin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +mime-db@1.46.0, mime-db@^1.28.0: + version "1.46.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" + integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== + +mime-types@^2.1.27, mime-types@~2.1.24: + version "2.1.29" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" + integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== + dependencies: + mime-db "1.46.0" + +mime@^2.0.3, mime@^2.3.1, mime@^2.4.5: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mini-css-extract-plugin@^1.3.5: + version "1.3.9" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.9.tgz#47a32132b0fd97a119acd530e8421e8f6ab16d5e" + integrity sha512-Ac4s+xhVbqlyhXS5J/Vh/QXUz3ycXlCqoCPpg0vdfhsIBH9eg/It/9L1r1XhSCH737M1lqcWnMuWL13zcygn5A== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + webpack-sources "^1.1.0" + +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + +minimatch@^3.0.0, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" + integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.0.0, minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp-classic@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +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== + +mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ml-array-max@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/ml-array-max/-/ml-array-max-1.2.3.tgz#92d1ffef667432d1451d35817a7276c528635e64" + integrity sha512-49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA== + dependencies: + is-any-array "^1.0.0" + +ml-array-min@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/ml-array-min/-/ml-array-min-1.2.2.tgz#abd68512a57fe8499513e6f2265533807e2bbe6b" + integrity sha512-yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ== + dependencies: + is-any-array "^1.0.0" + +ml-array-rescale@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz#a41a98535e5b3bcdcde2f1ef532f4453feb11104" + integrity sha512-czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA== + dependencies: + is-any-array "^1.0.0" + ml-array-max "^1.2.3" + ml-array-min "^1.2.2" + +ml-matrix@^6.5.0: + version "6.8.0" + resolved "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.8.0.tgz#55429ea9625def03ba34e7c8e6ca490409127aa6" + integrity sha512-c29k/gtyzLeNs0vLB2u4hHYcKr8PdyIs4oB0OsVhlgKiHbYyFkC2e98FcUPKhcnzn234jeZk42No+6d4bXBDNg== + dependencies: + ml-array-rescale "^1.3.5" + +mobius1-selectr@^2.4.13: + version "2.4.13" + resolved "https://registry.yarnpkg.com/mobius1-selectr/-/mobius1-selectr-2.4.13.tgz#0019dfd9f984840d6e40f70683ab3ec78ce3b5df" + integrity sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw== + +module-deps@^6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.3.tgz#15490bc02af4b56cf62299c7c17cba32d71a96ee" + integrity sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA== + dependencies: + JSONStream "^1.0.3" + browser-resolve "^2.0.0" + cached-path-relative "^1.0.2" + concat-stream "~1.6.0" + defined "^1.0.0" + detective "^5.2.0" + duplexer2 "^0.1.2" + inherits "^2.0.1" + parents "^1.0.0" + readable-stream "^2.0.2" + resolve "^1.4.0" + stream-combiner2 "^1.1.1" + subarg "^1.0.0" + through2 "^2.0.0" + xtend "^4.0.0" + +moment-timezone@^0.5.28, moment-timezone@^0.5.31, moment-timezone@^0.5.33: + version "0.5.33" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" + integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== + dependencies: + moment ">= 2.9.0" + +"moment@>= 2.9.0", moment@^2.10.2, moment@^2.29.0, moment@^2.29.1: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + +moment@~2.24.0: + version "2.24.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" + integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== + +moo@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4" + integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w== + +mousetrap@^1.6.3: + version "1.6.5" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" + integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA== + +mozjpeg@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-7.1.1.tgz#dfb61953536e66fcabd4ae795e7a312d42a51f18" + integrity sha512-iIDxWvzhWvLC9mcRJ1uSkiKaj4drF58oCqK2bITm5c2Jt6cJ8qQjSSru2PCaysG+hLIinryj8mgz5ZJzOYTv1A== + dependencies: + bin-build "^3.0.0" + bin-wrapper "^4.0.0" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2, ms@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nan@^2.14.2: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + +nanocolors@^0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" + integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== + +nanoid@^3.0.0, nanoid@^3.1.23: + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha1-YmZ1Itpmc5ccypFqbT7/P0Ff+Aw= + +nanopop@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nanopop/-/nanopop-2.1.0.tgz#23476513cee2405888afd2e8a4b54066b70b9e60" + integrity sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +nearley@^2.7.10: + version "2.20.1" + resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" + integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== + dependencies: + commander "^2.19.0" + moo "^0.5.0" + railroad-diagrams "^1.0.0" + randexp "0.4.6" + +neatequal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" + integrity sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs= + dependencies: + varstream "^0.3.2" + +negotiator@0.6.2, negotiator@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.6.0, neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-gyp@^8.1.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.3.0.tgz#ebc36a146d45095e1c6af6ccb0e47d1c8fc3fe69" + integrity sha512-e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^9.1.0" + nopt "^5.0.0" + npmlog "^4.1.2" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +node-releases@^1.1.71: + version "1.1.72" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe" + integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw== + +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + +normalize-url@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" + integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw== + dependencies: + prepend-http "^2.0.0" + query-string "^5.0.1" + sort-keys "^2.0.0" + +normalize-url@^4.5.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +notificar@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/notificar/-/notificar-1.0.1.tgz#11ba233c261eee02f5d688ee300ece5f72522887" + integrity sha512-jiCay0IY0N+gloyDks+v4WV+OKU4lIXUhQgxw4Iu9bXpw80cNXTezVv46OCK5+E8G8fkt1Bj76DNepULqlQS3Q== + +notistack@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/notistack/-/notistack-1.0.10.tgz#8db90830034383467a04184f1fa8ff77f4fc58a5" + integrity sha512-z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ== + dependencies: + clsx "^1.1.0" + hoist-non-react-statics "^3.3.0" + +npm-conf@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +npm-run-path@^4.0.0, npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +nth-check@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +nth-check@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== + dependencies: + boolbase "^1.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-inspect@^1.10.3, object-inspect@^1.7.0, object-inspect@^1.9.0: + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== + +object-is@^1.0.2, object-is@^1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.0, object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + +object.fromentries@^2.0.3, object.fromentries@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" + integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + has "^1.0.3" + +object.getownpropertydescriptors@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" + integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + +object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +opener@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +optipng-bin@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-7.0.1.tgz#beb8e55a52f8a26f885ee57ab44fcf62397d6972" + integrity sha512-W99mpdW7Nt2PpFiaO+74pkht7KEqkXkeRomdWXfEz3SALZ6hns81y/pm1dsGZ6ItUIfchiNIP6ORDr1zETU1jA== + dependencies: + bin-build "^3.0.0" + bin-wrapper "^4.0.0" + +os-browserify@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + +os-filter-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz#1c0b62d5f3a2442749a2d139e6dddee6e81d8d16" + integrity sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg== + dependencies: + arch "^2.1.0" + +os-shim@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" + integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + +ow@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/ow/-/ow-0.17.0.tgz#4f938999fed6264c9048cd6254356e0f1e7f688c" + integrity sha512-i3keDzDQP5lWIe4oODyDFey1qVrq2hXKTuTH2VpqwpYtzPiKZt2ziRI4NBQmgW40AnV5Euz17OyWweCb+bNEQA== + dependencies: + type-fest "^0.11.0" + +p-cancelable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" + integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + +p-cancelable@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" + integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ== + +p-event@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz#8e6b4f4f65c72bc5b6fe28b75eda874f96a4a085" + integrity sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU= + dependencies: + p-timeout "^1.1.1" + +p-event@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6" + integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA== + dependencies: + p-timeout "^2.0.1" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-is-promise@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" + integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2, p-limit@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map-series@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" + integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco= + dependencies: + p-reduce "^1.0.0" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-pipe@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e" + integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw== + +p-reduce@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" + integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= + +p-series@^1.0.0, p-series@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-series/-/p-series-1.1.0.tgz#f2d8522cdfd58b464eb9685651d465037ee3c957" + integrity sha512-356covArc9UCfj2twY/sxCJKGMzzO+pJJtucizsPC6aS1xKSTBc9PQrQhvFR3+7F+fa2KBKdJjdIcv6NEWDcIQ== + dependencies: + "@sindresorhus/is" "^0.7.0" + p-reduce "^1.0.0" + +p-timeout@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" + integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y= + dependencies: + p-finally "^1.0.0" + +p-timeout@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038" + integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== + dependencies: + p-finally "^1.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +pako@^1.0.0, pako@^1.0.4, pako@~1.0.5: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parents@^1.0.0, parents@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" + integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= + dependencies: + path-platform "~0.11.15" + +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== + dependencies: + asn1.js "^5.2.0" + browserify-aes "^1.0.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5-htmlparser2-tree-adapter@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseqs@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" + integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== + +parseuri@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" + integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-browserify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-fx@^2.0.0, path-fx@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/path-fx/-/path-fx-2.1.1.tgz#51594f9f8223d5c1d5b74be55f20a7abb18dc9f6" + integrity sha512-YQeSXseFrHZtxesLJVK4AGv/J3bPmmb0mAMeUbf52b2MVwLlzTEY2NatLP8mUE7eR0F4EBOIRmrQjPPvHZI2+Q== + dependencies: + is-relative "^1.0.0" + +path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-platform@~0.11.15: + version "0.11.15" + resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" + integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pathfinding@^0.4.18: + version "0.4.18" + resolved "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz#a9990f6fa22b7ef196e5651b049165403a045fe8" + integrity sha1-qZkPb6IrfvGW5WUbBJFlQDoEX+g= + dependencies: + heap "0.2.5" + +paths-js@^0.4.9: + version "0.4.11" + resolved "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.11.tgz#b2a9d5f94ee9949aa8fee945f78a12abff44599e" + integrity sha512-3mqcLomDBXOo7Fo+UlaenG6f71bk1ZezPQy2JCmYHy2W2k5VKpP+Jbin9H0bjXynelTbglCqdFhSEkeIkKTYUA== + +pbkdf2@^3.0.3: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422": + version "1.0.0" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422" + dependencies: + "@types/classnames" "^2.2.6" + "@types/react" "^16.7.18" + "@types/react-dom" "^16.0.11" + aspen-decorations "^1.1.1" + browserfs "^1.4.3" + classnames "^2.2.6" + context-menu "^2.0.0" + insert-if "^1.1.0" + lodash "4.*" + notificar "^1.0.1" + path-fx "^2.0.0" + react "^16.6.3" + react-aspen "^1.1.1" + react-dom "^16.6.3" + react-virtualized-auto-sizer "^1.0.6" + valid-filename "^2.0.1" + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +picomodal@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz#facd30f4fbf34a809c1e04ea525f004f399c0b82" + integrity sha1-+s0w9PvzSoCcHgTqUl8ATzmcC4I= + +pify@^2.2.0, pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +pkg-dir@^4.1.0, pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pngquant-bin@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-6.0.1.tgz#2b5789ca219eeb4d8509ab1ae082092801b7f07e" + integrity sha512-Q3PUyolfktf+hYio6wsg3SanQzEU/v8aICg/WpzxXcuCMRb7H2Q81okfpcEztbMvw25ILjd3a87doj2N9kvbpQ== + dependencies: + bin-build "^3.0.0" + bin-wrapper "^4.0.1" + execa "^4.0.0" + +popper.js@1.16.1-lts: + version "1.16.1-lts" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" + integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== + +popper.js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" + integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== + +postcss-calc@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== + dependencies: + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + +postcss-colormin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.1.1.tgz#834d262f6021f832d9085e355f08ade288a92a1d" + integrity sha512-SyTmqKKN6PyYNeeKEC0hqIP5CDuprO1hHurdW1aezDyfofDUOn7y7MaxcolbsW3oazPwFiGiY30XRiW1V4iZpA== + dependencies: + browserslist "^4.16.0" + colord "^2.0.0" + postcss-value-parser "^4.1.0" + +postcss-convert-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" + integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-discard-comments@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== + +postcss-discard-duplicates@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== + +postcss-discard-empty@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== + +postcss-discard-overridden@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== + +postcss-loader@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-5.1.0.tgz#8a36f18b8989bee94172626b25f2b9cc6160fb43" + integrity sha512-tGgKZF6Ntn16zIWXt7yKV19L0rISaozHPCfdPt+aHOnTZrreeqVR6hCkFhZYfJ6KgpyIFRkKuW8ygHtUid4GlA== + dependencies: + cosmiconfig "^7.0.0" + klona "^2.0.4" + semver "^7.3.4" + +postcss-merge-longhand@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" + integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== + dependencies: + css-color-names "^1.0.1" + postcss-value-parser "^4.1.0" + stylehacks "^5.0.1" + +postcss-merge-rules@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.1.tgz#4ff61c5089d86845184a0f149e88d687028bef7e" + integrity sha512-UR6R5Ph0c96QB9TMBH3ml8/kvPCThPHepdhRqAbvMRDRHQACPC8iM5NpfIC03+VRMZTGXy4L/BvFzcDFCgb+fA== + dependencies: + browserslist "^4.16.0" + caniuse-api "^3.0.0" + cssnano-utils "^2.0.1" + postcss-selector-parser "^6.0.5" + vendors "^1.0.3" + +postcss-minify-font-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-minify-gradients@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz#2dc79fd1a1afcb72a9e727bc549ce860f93565d2" + integrity sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g== + dependencies: + cssnano-utils "^2.0.1" + is-color-stop "^1.1.0" + postcss-value-parser "^4.1.0" + +postcss-minify-params@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" + integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== + dependencies: + alphanum-sort "^1.0.2" + browserslist "^4.16.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + uniqs "^2.0.0" + +postcss-minify-selectors@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== + dependencies: + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" + +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== + dependencies: + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-normalize-charset@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== + +postcss-normalize-display-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-positions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" + integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-normalize-repeat-style@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-string@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-normalize-timing-functions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-normalize-unicode@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== + dependencies: + browserslist "^4.16.0" + postcss-value-parser "^4.1.0" + +postcss-normalize-url@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.1.tgz#ffa9fe545935d8b57becbbb7934dd5e245513183" + integrity sha512-hkbG0j58Z1M830/CJ73VsP7gvlG1yF+4y7Fd1w4tD2c7CaA2Psll+pQ6eQhth9y9EaqZSLzamff/D0MZBMbYSg== + dependencies: + is-absolute-url "^3.0.3" + normalize-url "^4.5.0" + postcss-value-parser "^4.1.0" + +postcss-normalize-whitespace@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== + dependencies: + postcss-value-parser "^4.1.0" + +postcss-ordered-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.1.tgz#79ef6e2bd267ccad3fc0c4f4a586dfd01c131f64" + integrity sha512-6mkCF5BQ25HvEcDfrMHCLLFHlraBSlOXFnQMHYhSpDO/5jSR1k8LdEXOkv+7+uzW6o6tBYea1Km0wQSRkPJkwA== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-reduce-initial@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" + integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== + dependencies: + browserslist "^4.16.0" + caniuse-api "^3.0.0" + +postcss-reduce-transforms@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== + dependencies: + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" + +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-svgo@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.1.tgz#6ed5e01e164e59204978994d844c653a331a8100" + integrity sha512-cD7DFo6tF9i5eWvwtI4irKOHCpmASFS0xvZ5EQIgEdA1AWfM/XiHHY/iss0gcKHhkqwgYmuo2M0KhJLd5Us6mg== + dependencies: + postcss-value-parser "^4.1.0" + svgo "^2.3.0" + +postcss-unique-selectors@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" + integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== + dependencies: + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" + uniqs "^2.0.0" + +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss@^8.2.15, postcss@^8.2.6, postcss@^8.2.9: + version "8.2.15" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" + integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map "^0.6.1" + +precond@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" + integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +process@^0.11.10, process@~0.11.0: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +prop-types-exact@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869" + integrity sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA== + dependencies: + has "^1.0.3" + object.assign "^4.1.0" + reflect.ownkeys "^0.2.0" + +prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +public-encrypt@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" + integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + safe-buffer "^5.1.2" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + +qjobs@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" + integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +query-string@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== + dependencies: + decode-uri-component "^0.2.0" + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + +querystring-es3@~0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +raf@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" + integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== + dependencies: + performance-now "^2.1.0" + +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= + +randexp@0.4.6: + version "0.4.6" + resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +randomfill@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + +range-parser@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +react-aspen@^1.1.0, react-aspen@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038" + integrity sha512-m+r+UIAw29PKgt+2on7zR/fCa7dnvLeM/x2HorGPa39xm4ELHY0PhN0oyE2mO95yqha7mqexD7RXd6iKfVKv7g== + dependencies: + aspen-tree-model "^1.0.5" + notificar "^1.0.1" + p-series "^1.0.0" + path-fx "^2.1.1" + react-window "^1.3.1" + +react-checkbox-tree@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/react-checkbox-tree/-/react-checkbox-tree-1.7.2.tgz#71cb5d22add293a92eb718de8425c8430b2db263" + integrity sha512-T0Y3Us2ds5QppOgIM/cSbtdrEBcCGkiz03o2p4elTireAIw0i5k5xPoaTxbjWTFmzgXajUrJzQMlBujEQhOUsQ== + dependencies: + classnames "^2.2.5" + lodash "^4.17.10" + nanoid "^3.0.0" + prop-types "^15.5.8" + +react-dom@^16.6.3: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" + integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-dom@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react-draggable@^4.4.4: + version "4.4.4" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" + integrity sha512-6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA== + dependencies: + clsx "^1.1.1" + prop-types "^15.6.0" + +react-input-autosize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85" + integrity sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg== + dependencies: + prop-types "^15.5.8" + +"react-is@^16.12.0 || ^17.0.0", "react-is@^16.8.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-property@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6" + integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ== + +react-select@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81" + integrity sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q== + dependencies: + "@babel/runtime" "^7.12.0" + "@emotion/cache" "^11.4.0" + "@emotion/react" "^11.1.1" + memoize-one "^5.0.0" + prop-types "^15.6.0" + react-input-autosize "^3.0.0" + react-transition-group "^4.3.0" + +react-shallow-renderer@^16.13.1: + version "16.14.1" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124" + integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg== + dependencies: + object-assign "^4.1.1" + react-is "^16.12.0 || ^17.0.0" + +react-table@^7.6.3: + version "7.7.0" + resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.7.0.tgz#e2ce14d7fe3a559f7444e9ecfe8231ea8373f912" + integrity sha512-jBlj70iBwOTvvImsU9t01LjFjy4sXEtclBovl3mTiqjz23Reu0DKnRza4zlLtOPACx6j2/7MrQIthIK1Wi+LIA== + +react-test-renderer@^17.0.0: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c" + integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ== + dependencies: + object-assign "^4.1.1" + react-is "^17.0.2" + react-shallow-renderer "^16.13.1" + scheduler "^0.20.2" + +react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-group@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" + integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + +react-virtualized-auto-sizer@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca" + integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ== + +react-window@^1.3.1, react-window@^1.8.5: + version "1.8.6" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112" + integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one ">=3.1.1 <6" + +react@^16.6.3: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" + integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +react@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +read-only-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" + integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= + dependencies: + readable-stream "^2.0.2" + +readable-stream@^1.0.33: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" + integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q== + dependencies: + resolve "^1.9.0" + +reflect.ownkeys@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" + integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= + +regenerate-unicode-properties@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" + integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== + dependencies: + regenerate "^1.4.0" + +regenerate@^1.4.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + +regenerator-transform@^0.14.2: + version "0.14.5" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== + dependencies: + "@babel/runtime" "^7.8.4" + +regexp.prototype.flags@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + +regexpu-core@^4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" + integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.2.0" + regjsgen "^0.5.1" + regjsparser "^0.6.4" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.2.0" + +regjsgen@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== + +regjsparser@^0.6.4: + version "0.6.9" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" + integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== + dependencies: + jsesc "~0.5.0" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + +replace-ext@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.1.4, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.4.0, resolve@^1.9.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +responselike@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" + integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== + +rgb-regex@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" + integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= + +rgba-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" + integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= + +rifm@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/rifm/-/rifm-0.7.0.tgz#debe951a9c83549ca6b33e5919f716044c2230be" + integrity sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ== + dependencies: + "@babel/runtime" "^7.3.1" + +rimraf@^2.5.4: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +rst-selector-parser@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" + integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= + dependencies: + lodash.flattendeep "^4.4.0" + nearley "^2.7.10" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sass-loader@^11.0.0: + version "11.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.1.1.tgz#0db441bbbe197b2af96125bebb7f4be6476b13a7" + integrity sha512-fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA== + dependencies: + klona "^2.0.4" + neo-async "^2.6.2" + +sass-resources-loader@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.1.tgz#d7dbc36ccb25b2d8ffa508b1b8630b987df1e5c3" + integrity sha512-WlofxbWOVnxad874IHZdWbP9eW1pbyqsTJKBsMbeB+YELvLSrZQNDTpH70s6F19BwtanR3NEFnyGwJ9WyotJTQ== + dependencies: + async "^3.2.0" + chalk "^4.1.0" + glob "^7.1.6" + loader-utils "^2.0.0" + +sass@^1.24.4: + version "1.32.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" + integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== + dependencies: + chokidar ">=2.0.0 <4.0.0" + +sax@^1.2.4, sax@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +schema-utils@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" + integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8= + dependencies: + ajv "^5.0.0" + +schema-utils@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" + integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== + dependencies: + ajv "^6.1.0" + ajv-errors "^1.0.0" + ajv-keywords "^3.1.0" + +schema-utils@^2.6.5: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +seek-bzip@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== + dependencies: + commander "^2.8.1" + +select2@^4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d" + integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw== + +semver-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" + integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== + +semver-truncate@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8" + integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g= + dependencies: + semver "^5.3.0" + +semver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + +semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +serialize-javascript@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shallowequal@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + +shasum-object@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shasum-object/-/shasum-object-1.0.0.tgz#0b7b74ff5b66ecf9035475522fa05090ac47e29e" + integrity sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg== + dependencies: + fast-safe-stringify "^2.0.7" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shell-quote@^1.6.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" + integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== + +shim-loader@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz#2583a6d2aa938897c2a41658bcef73ec87d3aa5e" + integrity sha1-JYOm0qqTiJfCpBZYvO9z7IfTql4= + dependencies: + loader-utils "^1.1.0" + lodash "^4.14.1" + precond "^0.2.3" + webpack-sources "^0.2.3" + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +sirv@^1.0.7: + version "1.0.12" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.12.tgz#d816c882b35489b3c63290e2f455ae3eccd5f652" + integrity sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg== + dependencies: + "@polka/url" "^1.0.0-next.15" + mime "^2.3.1" + totalist "^1.0.0" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +"slickgrid@git+https://github.com/6pac/SlickGrid.git#2.3.16": + version "2.3.16" + resolved "git+https://github.com/6pac/SlickGrid.git#4f8c6f498d0b82391fdf382beb8ef114ed7408e7" + dependencies: + jquery ">=1.8.0" + jquery-ui ">=1.8.0" + +smart-buffer@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +snapsvg-cjs@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz#3b2f56af2573d3d364c3ed5bf8885745f4d2dde1" + integrity sha1-Oy9WryVz09Nkw+1b+IhXRfTS3eE= + dependencies: + snapsvg "0.5.1" + +snapsvg@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3" + integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M= + dependencies: + eve "~0.5.1" + +socket.io-adapter@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" + integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== + +socket.io-client@^4.0.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.1.2.tgz#95ad7113318ea01fba0860237b96d71e1b1fd2eb" + integrity sha512-RDpWJP4DQT1XeexmeDyDkm0vrFc0+bUsHDKiVGaNISJvJonhQQOMqV9Vwfg0ZpPJ27LCdan7iqTI92FRSOkFWQ== + dependencies: + "@types/component-emitter" "^1.2.10" + backo2 "~1.0.2" + component-emitter "~1.3.0" + debug "~4.3.1" + engine.io-client "~5.1.1" + parseuri "0.0.6" + socket.io-parser "~4.0.4" + +socket.io-parser@~4.0.3, socket.io-parser@~4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" + integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== + dependencies: + "@types/component-emitter" "^1.2.10" + component-emitter "~1.3.0" + debug "~4.3.1" + +socket.io@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a" + integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw== + dependencies: + "@types/cookie" "^0.4.0" + "@types/cors" "^2.8.8" + "@types/node" ">=10.0.0" + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.1" + engine.io "~4.1.0" + socket.io-adapter "~2.1.0" + socket.io-parser "~4.0.3" + +socks-proxy-agent@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3" + integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg== + dependencies: + agent-base "^6.0.2" + debug "^4.3.1" + socks "^2.6.1" + +socks@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" + integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg= + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + +sort-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" + integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= + dependencies: + is-plain-obj "^1.0.0" + +source-list-map@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1" + integrity sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE= + +source-list-map@^2.0.0, source-list-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== + +source-map-support@^0.5.5, source-map-support@~0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.5.0, source-map@^0.5.7, source-map@~0.5.3: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.2: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +split.js@^1.5.10: + version "1.6.4" + resolved "https://registry.yarnpkg.com/split.js/-/split.js-1.6.4.tgz#13d47cba53382adef230a53294ce5dacb2a2f2e1" + integrity sha512-kYmQZprRJrF1IOjg/E+gdBEsKFv5kbgUE6RJVJZvrIzTOK/IHzKSqIeiJnWs7IP5D9TnpTQ2CbanuDuIWcyDUQ== + +sprintf-js@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +ssri@^8.0.0, ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-browserify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" + integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA== + dependencies: + inherits "~2.0.4" + readable-stream "^3.5.0" + +stream-combiner2@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" + integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= + dependencies: + duplexer2 "~0.1.0" + readable-stream "^2.0.2" + +stream-http@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.4" + readable-stream "^3.6.0" + xtend "^4.0.2" + +stream-splicer@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.1.tgz#0b13b7ee2b5ac7e0609a7463d83899589a363fcd" + integrity sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg== + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.2" + +streamroller@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz#30418d0eee3d6c93ec897f892ed098e3a81e68b7" + integrity sha1-MEGNDu49bJPsiX+JLtCY46geaLc= + dependencies: + date-format "^4.0.3" + debug "^4.1.1" + fs-extra "^10.0.0" + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string.fromcodepoint@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653" + integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM= + +string.prototype.codepointat@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" + integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== + +string.prototype.matchall@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" + integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trim@^1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd" + integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-comments@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" + integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== + +strip-dirs@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" + integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== + dependencies: + is-natural-number "^4.0.1" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-outer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" + integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg== + dependencies: + escape-string-regexp "^1.0.2" + +style-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" + integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +style-to-js@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.0.tgz#631cbb20fce204019b3aa1fcb5b69d951ceac4ac" + integrity sha512-1OqefPDxGrlMwcbfpsTVRyzwdhr4W0uxYQzeA2F1CBc8WG04udg2+ybRnvh3XYL4TdHQrCahLtax2jc8xaE6rA== + dependencies: + style-to-object "0.3.0" + +style-to-object@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== + dependencies: + inline-style-parser "0.1.1" + +styled-components@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz#6ed7fad2dc233825f64c719ffbdedd84ad79101a" + integrity sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/traverse" "^7.4.5" + "@emotion/is-prop-valid" "^0.8.8" + "@emotion/stylis" "^0.8.4" + "@emotion/unitless" "^0.7.4" + babel-plugin-styled-components ">= 1" + css-to-react-native "^3.0.0" + hoist-non-react-statics "^3.0.0" + shallowequal "^1.1.0" + supports-color "^5.5.0" + +stylehacks@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== + dependencies: + browserslist "^4.16.0" + postcss-selector-parser "^6.0.4" + +stylis@^4.0.3, stylis@^4.0.7: + version "4.0.10" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" + integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg== + +subarg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI= + dependencies: + minimist "^1.1.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0, supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +svg-pathdata@^5.0.2: + version "5.0.5" + resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz#65e8d765642ba15fe15434444087d082bc526b29" + integrity sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow== + +svg2ttf@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz#75c9b8d3c799a91c893ef7bdbfa72d8e00a48a5c" + integrity sha512-CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA== + dependencies: + argparse "^2.0.1" + cubic2quad "^1.0.0" + lodash "^4.17.10" + microbuffer "^1.0.0" + svgpath "^2.1.5" + xmldom "~0.5.0" + +svgicons2svgfont@^9.0.3: + version "9.2.0" + resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz#9ff1b643891891eb52ab1bd764b468e2d06ded80" + integrity sha512-mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ== + dependencies: + array.prototype.flatmap "1.2.4" + commander "^4.0.1" + geometry-interfaces "^1.1.4" + glob "^7.1.6" + neatequal "^1.0.0" + readable-stream "^3.4.0" + sax "^1.2.4" + string.fromcodepoint "^0.2.1" + string.prototype.codepointat "^0.2.1" + svg-pathdata "^5.0.2" + +svgo-loader@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/svgo-loader/-/svgo-loader-2.2.2.tgz#5f54e3e0d77c36a84c42bcb42e812c4db534bf96" + integrity sha512-UeE/4yZEK96LoYqvxwh8YqCOJCjXwRY9K6YT99vXE+nYhs/W8hAY2hNf5zg/lRsyKshJkR79V+4beV3cbGL40Q== + dependencies: + js-yaml "^3.13.1" + loader-utils "^1.0.3" + +svgo@^1.1.1, svgo@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== + dependencies: + chalk "^2.4.1" + coa "^2.0.2" + css-select "^2.0.0" + css-select-base-adapter "^0.1.1" + css-tree "1.0.0-alpha.37" + csso "^4.0.2" + js-yaml "^3.13.1" + mkdirp "~0.5.1" + object.values "^1.1.0" + sax "~1.2.4" + stable "^0.1.8" + unquote "~1.1.1" + util.promisify "~1.0.0" + +svgo@^2.3.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz#e164cded22f4408fe4978f082be80159caea1e2d" + integrity sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" + nanocolors "^0.1.12" + stable "^0.1.8" + +svgpath@^2.1.5: + version "2.3.1" + resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz#b102334bebd2244b4818460ba2ebad52716a0d43" + integrity sha512-wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg== + +symbol-observable@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + +syntax-error@^1.1.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c" + integrity sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w== + dependencies: + acorn-node "^1.2.0" + +table@^6.0.4: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + +tablesorter@^2.31.2: + version "2.31.3" + resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz#94c33234ba0e5d9efc5ba4e48651010a396c8b64" + integrity sha512-ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA== + dependencies: + jquery ">=1.2.6" + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" + integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== + +tar-stream@^1.5.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" + integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== + dependencies: + bl "^1.0.0" + buffer-alloc "^1.2.0" + end-of-stream "^1.0.0" + fs-constants "^1.0.0" + readable-stream "^2.3.0" + to-buffer "^1.1.1" + xtend "^4.0.0" + +tar@^6.0.2, tar@^6.1.2: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +temp-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= + +tempfile@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" + integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= + dependencies: + temp-dir "^1.0.0" + uuid "^3.0.1" + +tempusdominus-bootstrap-4@^5.1.2: + version "5.39.0" + resolved "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz#f13dcfec6c41b37c5fe509f08bd513590c64411f" + integrity sha512-vYnkmQYQq4+A51WyRc/6e03eM0BHDoPaxd556K1pd4Nhr0eGeB3+Mi9b+3CDx4189fg3gQlrsKzgJiHPRwSX3Q== + dependencies: + bootstrap "^4.5.2" + jquery "^3.5.1" + moment "^2.29.0" + moment-timezone "^0.5.31" + popper.js "^1.16.1" + +tempusdominus-core@^5.0.3: + version "5.19.0" + resolved "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz#ccbd2c35109b0a4b96c61513e53e0175ec4896bd" + integrity sha512-7a4oBQw4cjz6C87BLRg3KHVvzpnPlnRTkuDZ7SwcJayQQ4QgOryX5u6wj0q07TXhgtMQLCntZO6nVhHIKPaeUw== + dependencies: + jquery "^3.5.0" + moment "~2.24.0" + moment-timezone "^0.5.28" + +terser-webpack-plugin@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz#51d295eb7cc56785a67a372575fdc46e42d5c20c" + integrity sha512-6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q== + dependencies: + jest-worker "^26.6.2" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + terser "^5.7.0" + +terser@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" + integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +"through@>=2.2.7 <3", through@^2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +timed-out@^4.0.0, timed-out@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= + +timers-browserify@^1.0.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" + integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= + dependencies: + process "~0.11.0" + +timsort@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + +tiny-emitter@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" + integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== + +tiny-warning@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + +tippy.js@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.1.tgz#3788a007be7015eee0fd589a66b98fb3f8f10181" + integrity sha512-JnFncCq+rF1dTURupoJ4yPie5Cof978inW6/4S6kmWV7LL9YOSEVMifED3KdrVPEG+Z/TFH2CDNJcQEfaeuQww== + dependencies: + "@popperjs/core" "^2.8.3" + +tmp@0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-buffer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" + integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== + +to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +totalist@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" + integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== + +trim-repeated@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" + integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE= + dependencies: + escape-string-regexp "^1.0.2" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= + +tslib@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== + +ttf2eot@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b" + integrity sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs= + dependencies: + argparse "^1.0.6" + microbuffer "^1.0.0" + +ttf2woff2@^4.0.1: + version "4.0.4" + resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz#a995856dc0cc6f4b12ea38c5de7ab289b645ef26" + integrity sha512-pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g== + dependencies: + bindings "^1.5.0" + bufferstreams "^3.0.0" + nan "^2.14.2" + node-gyp "^8.1.0" + +ttf2woff@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz#09a7cee59abd3c15282b57ed84ac7c7770749f1f" + integrity sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA== + dependencies: + argparse "^1.0.6" + microbuffer "^1.0.0" + pako "^1.0.0" + +tty-browserify@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" + integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-is@~1.6.17: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript@^3.2.2: + version "3.9.10" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" + integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== + +ua-parser-js@^0.7.23: + version "0.7.24" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" + integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== + +uglify-js@^3.1.4: + version "3.14.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz#d7dd6a46ca57214f54a2d0a43cad0f35db82ac99" + integrity sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A== + +umd@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" + integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow== + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + +unbzip2-stream@^1.0.9: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +unc-path-regex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + +undeclared-identifiers@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz#9254c1d37bdac0ac2b52de4b6722792d2a91e30f" + integrity sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw== + dependencies: + acorn-node "^1.3.0" + dash-ast "^1.0.0" + get-assigned-identifiers "^1.2.0" + simple-concat "^1.0.0" + xtend "^4.0.1" + +underscore@>=1.7.0, underscore@>=1.8.3, underscore@^1.13.1, underscore@^1.8.0, underscore@^1.8.3, underscore@^1.9.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" + integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== + +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== + +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + +unicode-match-property-value-ecmascript@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" + integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== + +unicode-property-aliases-ecmascript@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" + integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== + +uniqs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" + integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= + +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unquote@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-join@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + +url-loader@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8" + integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg== + dependencies: + loader-utils "^1.1.0" + mime "^2.0.3" + schema-utils "^1.0.0" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + dependencies: + prepend-http "^1.0.1" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +url-to-options@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" + integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= + +url@~0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util.promisify@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" + +util@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + dependencies: + inherits "2.0.1" + +util@~0.12.0: + version "0.12.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" + integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + safe-buffer "^5.1.2" + which-typed-array "^1.1.2" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.0.1: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +valid-filename@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" + integrity sha1-B2jW82Sx7TvfaPDRWr/7DZ1s7K8= + dependencies: + filename-reserved-regex "^2.0.0" + +vanilla-picker@^2.11.2: + version "2.11.2" + resolved "https://registry.yarnpkg.com/vanilla-picker/-/vanilla-picker-2.11.2.tgz#eaa24efa68c27e7ee9e0776df55d6913b855f133" + integrity sha512-2cP7LlUnxHxwOf06ReUVtd2RFJMnJGaxN2s0p8wzBH3In5b00Le7fFZ9VrIoBE0svZkSq/BC/Pwq/k/9n+AA2g== + dependencies: + "@sphinxxxx/color-conversion" "^2.2.2" + +varstream@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1" + integrity sha1-GKxklHZfP/GjWtmkvgU77BiKXeE= + dependencies: + readable-stream "^1.0.33" + +vary@^1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +vendors@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== + +vm-browserify@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== + +void-elements@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" + integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= + +watchpack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" + integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd": + version "2.2.5" + resolved "git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd" + dependencies: + "@fortawesome/fontawesome-free" "^5.14.0" + FileSaver "^0.10.0" + jquery "^3.3.1" + jquery-contextmenu "^2.6.4" + +webfonts-loader@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz#a720fd919aad090ddb56252384035aa6fb882d99" + integrity sha512-vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg== + dependencies: + "@vusion/webfonts-generator" "^0.7.2" + glob "^7.1.6" + loader-utils "^2.0.0" + +webpack-bundle-analyzer@^4.4.0: + version "4.4.2" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz#39898cf6200178240910d629705f0f3493f7d666" + integrity sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ== + dependencies: + acorn "^8.0.4" + acorn-walk "^8.0.0" + chalk "^4.1.0" + commander "^6.2.0" + gzip-size "^6.0.0" + lodash "^4.17.20" + opener "^1.5.2" + sirv "^1.0.7" + ws "^7.3.1" + +webpack-cli@^4.5.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" + integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.0.3" + "@webpack-cli/info" "^1.2.4" + "@webpack-cli/serve" "^1.4.0" + colorette "^1.2.1" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + v8-compile-cache "^2.2.0" + webpack-merge "^5.7.3" + +webpack-merge@^4.1.5: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" + integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== + dependencies: + lodash "^4.17.15" + +webpack-merge@^5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" + integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + +webpack-sources@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" + integrity sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s= + dependencies: + source-list-map "^1.1.1" + source-map "~0.5.3" + +webpack-sources@^1.1.0: + version "1.4.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack-sources@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" + integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ== + dependencies: + source-list-map "^2.0.1" + source-map "^0.6.1" + +webpack@^5.21.2: + version "5.24.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.3.tgz#6ec0f5059f8d7c7961075fa553cfce7b7928acb3" + integrity sha512-x7lrWZ7wlWAdyKdML6YPvfVZkhD1ICuIZGODE5SzKJjqI9A4SpqGTjGJTc6CwaHqn19gGaoOR3ONJ46nYsn9rw== + dependencies: + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.46" + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/wasm-edit" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + acorn "^8.0.4" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.7.0" + es-module-lexer "^0.4.0" + eslint-scope "^5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.0.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.1" + watchpack "^2.0.0" + webpack-sources "^2.1.1" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-typed-array@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" + integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + dependencies: + available-typed-arrays "^1.0.2" + call-bind "^1.0.0" + es-abstract "^1.18.0-next.1" + foreach "^2.0.5" + function-bind "^1.1.1" + has-symbols "^1.0.1" + is-typed-array "^1.1.3" + +which@^1.2.1, which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + +wkx@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c" + integrity sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg== + dependencies: + "@types/node" "*" + +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^7.3.1, ws@~7.4.2: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + +xmldom@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== + +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +xterm-addon-fit@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" + integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== + +xterm-addon-search@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz#e33eab918df7eac7e7baf95dd2b3d14133754881" + integrity sha512-MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA== + +xterm-addon-web-links@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz#265cbf8221b9b315d0a748e1323bee331cd5da03" + integrity sha512-xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg== + +xterm@^4.11.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.12.0.tgz#db09b425b4dcae5b96f8cbbaaa93b3bc60997ca9" + integrity sha512-K5mF/p3txUV18mjiZFlElagoHFpqXrm5OYHeoymeXSu8GG/nMaOO/+NRcNCwfdjzAbdQ5VLF32hEHiWWKKm0bw== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0, yaml@^1.7.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.6" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20" + integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA== + +yargs@^16.1.1: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yarn-audit-html@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-2.1.0.tgz#c3344007bdf61b8d0d98264adad8ad01b7df9c90" + integrity sha512-5mNqo8SBhf/7y1AsZYdOImS0anZkKNqJTdGFYwm/je273V83kAE0nYTAYyl5LTicsF09QiPwFlZVdQ/PbGfj6w== + dependencies: + commander "^7.0.0" + ejs "~3.1.6" + marked "^2.0.0" + +yauzl@^2.4.2: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix new file mode 100644 index 0000000000..672c1a7b9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix @@ -0,0 +1,10717 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + } + { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + }; + } + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; + }; + } + { + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha512 = "nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw=="; + }; + } + { + name = "_babel_core___core_7.13.8.tgz"; + path = fetchurl { + name = "_babel_core___core_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.13.8.tgz"; + sha512 = "oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg=="; + }; + } + { + name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + path = fetchurl { + name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz"; + sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw=="; + }; + } + { + name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + path = fetchurl { + name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz"; + sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w=="; + }; + } + { + name = "_babel_generator___generator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz"; + sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"; + sha512 = "EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA=="; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.6.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz"; + sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg=="; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.3.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz"; + sha512 = "JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA=="; + }; + } + { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; + path = fetchurl { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz"; + sha512 = "nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg=="; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha512 = "Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ=="; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha512 = "I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg=="; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha512 = "TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA=="; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz"; + sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw=="; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha512 = "IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA=="; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; + }; + } + { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; + }; + } + { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + }; + } + { + name = "_babel_helpers___helpers_7.13.0.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz"; + sha512 = "aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ=="; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; + }; + } + { + name = "_babel_parser___parser_7.14.7.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz"; + sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; + sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA=="; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; + sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; + sha512 = "sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ=="; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; + sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; + sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; + sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; + sha512 = "DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg=="; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"; + sha512 = "082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g=="; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; + sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz"; + sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ=="; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + }; + } + { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha512 = "u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q=="; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz"; + sha512 = "neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg=="; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; + sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; + sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA=="; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; + sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ=="; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; + sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw=="; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; + sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw=="; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"; + sha512 = "Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA=="; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.14.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz"; + sha512 = "zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw=="; + }; + } + { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; + sha512 = "BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ=="; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; + sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA=="; + }; + } + { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; + sha512 = "RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg=="; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; + sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + }; + } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.14.6.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz"; + sha512 = "XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA=="; + }; + } + { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + }; + } + { + name = "_babel_preset_env___preset_env_7.13.9.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.13.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.9.tgz"; + sha512 = "mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ=="; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; + }; + } + { + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; + sha512 = "gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA=="; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.14.5.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz"; + sha512 = "u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw=="; + }; + } + { + name = "_babel_runtime___runtime_7.14.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; + sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + }; + } + { + name = "_babel_template___template_7.14.5.tgz"; + path = fetchurl { + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; + }; + } + { + name = "_babel_traverse___traverse_7.14.7.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz"; + sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; + }; + } + { + name = "_babel_types___types_7.15.4.tgz"; + path = fetchurl { + name = "_babel_types___types_7.15.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.4.tgz"; + sha512 = "0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw=="; + }; + } + { + name = "_date_io_core___core_1.3.13.tgz"; + path = fetchurl { + name = "_date_io_core___core_1.3.13.tgz"; + url = "https://registry.yarnpkg.com/@date-io/core/-/core-1.3.13.tgz"; + sha512 = "AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA=="; + }; + } + { + name = "_date_io_date_fns___date_fns_1.3.13.tgz"; + path = fetchurl { + name = "_date_io_date_fns___date_fns_1.3.13.tgz"; + url = "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-1.3.13.tgz"; + sha512 = "yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA=="; + }; + } + { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + path = fetchurl { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; + }; + } + { + name = "_emotion_cache___cache_10.0.29.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_10.0.29.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz"; + sha512 = "fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ=="; + }; + } + { + name = "_emotion_cache___cache_11.4.0.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_11.4.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz"; + sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g=="; + }; + } + { + name = "_emotion_core___core_10.1.1.tgz"; + path = fetchurl { + name = "_emotion_core___core_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz"; + sha512 = "ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA=="; + }; + } + { + name = "_emotion_css___css_10.0.27.tgz"; + path = fetchurl { + name = "_emotion_css___css_10.0.27.tgz"; + url = "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz"; + sha512 = "6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw=="; + }; + } + { + name = "_emotion_hash___hash_0.8.0.tgz"; + path = fetchurl { + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha512 = "kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="; + }; + } + { + name = "_emotion_is_prop_valid___is_prop_valid_0.8.8.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_0.8.8.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"; + sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; + }; + } + { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz"; + sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; + }; + } + { + name = "_emotion_memoize___memoize_0.7.5.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz"; + sha512 = "igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="; + }; + } + { + name = "_emotion_react___react_11.4.0.tgz"; + path = fetchurl { + name = "_emotion_react___react_11.4.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/react/-/react-11.4.0.tgz"; + sha512 = "4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg=="; + }; + } + { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_0.11.16.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz"; + sha512 = "G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg=="; + }; + } + { + name = "_emotion_serialize___serialize_1.0.2.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz"; + sha512 = "95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A=="; + }; + } + { + name = "_emotion_sheet___sheet_0.9.4.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_0.9.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz"; + sha512 = "zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA=="; + }; + } + { + name = "_emotion_sheet___sheet_1.0.1.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz"; + sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="; + }; + } + { + name = "_emotion_styled_base___styled_base_10.0.31.tgz"; + path = fetchurl { + name = "_emotion_styled_base___styled_base_10.0.31.tgz"; + url = "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz"; + sha512 = "wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ=="; + }; + } + { + name = "_emotion_styled___styled_10.0.27.tgz"; + path = fetchurl { + name = "_emotion_styled___styled_10.0.27.tgz"; + url = "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz"; + sha512 = "iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q=="; + }; + } + { + name = "_emotion_stylis___stylis_0.8.5.tgz"; + path = fetchurl { + name = "_emotion_stylis___stylis_0.8.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz"; + sha512 = "h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="; + }; + } + { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + path = fetchurl { + name = "_emotion_unitless___unitless_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz"; + sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; + }; + } + { + name = "_emotion_utils___utils_0.11.3.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.11.3.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz"; + sha512 = "0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw=="; + }; + } + { + name = "_emotion_utils___utils_1.0.0.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz"; + sha512 = "mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="; + }; + } + { + name = "_emotion_weak_memoize___weak_memoize_0.2.5.tgz"; + path = fetchurl { + name = "_emotion_weak_memoize___weak_memoize_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"; + sha512 = "6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + }; + } + { + name = "_fortawesome_fontawesome_free___fontawesome_free_5.15.4.tgz"; + path = fetchurl { + name = "_fortawesome_fontawesome_free___fontawesome_free_5.15.4.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz"; + sha512 = "eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg=="; + }; + } + { + name = "_gar_promisify___promisify_1.1.2.tgz"; + path = fetchurl { + name = "_gar_promisify___promisify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; + sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; + }; + } + { + name = "_istanbuljs_schema___schema_0.1.3.tgz"; + path = fetchurl { + name = "_istanbuljs_schema___schema_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz"; + sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; + }; + } + { + name = "_material_ui_core___core_4.11.0.tgz"; + path = fetchurl { + name = "_material_ui_core___core_4.11.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz"; + sha512 = "bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g=="; + }; + } + { + name = "_material_ui_icons___icons_4.11.2.tgz"; + path = fetchurl { + name = "_material_ui_icons___icons_4.11.2.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz"; + sha512 = "fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ=="; + }; + } + { + name = "_material_ui_lab___lab_4.0.0_alpha.58.tgz"; + path = fetchurl { + name = "_material_ui_lab___lab_4.0.0_alpha.58.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.58.tgz"; + sha512 = "GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw=="; + }; + } + { + name = "_material_ui_pickers___pickers_3.2.10.tgz"; + path = fetchurl { + name = "_material_ui_pickers___pickers_3.2.10.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/pickers/-/pickers-3.2.10.tgz"; + sha512 = "B8G6Obn5S3RCl7hwahkQj9sKUapwXWFjiaz/Bsw1fhYFdNMnDUolRiWQSoKPb1/oKe37Dtfszoywi1Ynbo3y8w=="; + }; + } + { + name = "_material_ui_styles___styles_4.11.4.tgz"; + path = fetchurl { + name = "_material_ui_styles___styles_4.11.4.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz"; + sha512 = "KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew=="; + }; + } + { + name = "_material_ui_system___system_4.12.1.tgz"; + path = fetchurl { + name = "_material_ui_system___system_4.12.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz"; + sha512 = "lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw=="; + }; + } + { + name = "_material_ui_types___types_5.1.0.tgz"; + path = fetchurl { + name = "_material_ui_types___types_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz"; + sha512 = "7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A=="; + }; + } + { + name = "_material_ui_utils___utils_4.11.2.tgz"; + path = fetchurl { + name = "_material_ui_utils___utils_4.11.2.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz"; + sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + }; + } + { + name = "_npmcli_fs___fs_1.0.0.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; + sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; + }; + } + { + name = "_npmcli_move_file___move_file_1.1.2.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + } + { + name = "_polka_url___url_1.0.0_next.15.tgz"; + path = fetchurl { + name = "_polka_url___url_1.0.0_next.15.tgz"; + url = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz"; + sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA=="; + }; + } + { + name = "_popperjs_core___core_2.9.0.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz"; + sha512 = "wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew=="; + }; + } + { + name = "_projectstorm_geometry___geometry_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_geometry___geometry_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/geometry/-/geometry-6.6.1.tgz"; + sha512 = "gWRkv+fm+VIpoffHzDHPmGYlEqx8xWGfE/JR7TXAZweNdjEIxyhT++hVlCJiFJS+/cGqgN3z+eP7PNjwZUPGRg=="; + }; + } + { + name = "_projectstorm_react_canvas_core___react_canvas_core_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_react_canvas_core___react_canvas_core_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/react-canvas-core/-/react-canvas-core-6.6.1.tgz"; + sha512 = "wAxEh4Wja2Au0QAuLqxJNaWpVxYIffTFUZhjH8wtW8MKCWS6W9RnP6upeC8QVQi29NS59UIX4wXNzb6e6ht5ww=="; + }; + } + { + name = "_projectstorm_react_diagrams_core___react_diagrams_core_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_react_diagrams_core___react_diagrams_core_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/react-diagrams-core/-/react-diagrams-core-6.6.1.tgz"; + sha512 = "TiDwpcH+t2b2tG/UHDQvhlyx3gOQRJXxTyNDo7p+430ikTrvz1f8uNe5Rt3SrzyqxeUazLFXYBgbGpEanqOykQ=="; + }; + } + { + name = "_projectstorm_react_diagrams_defaults___react_diagrams_defaults_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_react_diagrams_defaults___react_diagrams_defaults_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/react-diagrams-defaults/-/react-diagrams-defaults-6.6.1.tgz"; + sha512 = "FJu8BNBjvANVZ8N99WXS/f6Mu5/yMC4Pi55kTG3vq7o14tsVMcghosmxst5eoeL251O4I+ulNvQ/yCc1Mc5org=="; + }; + } + { + name = "_projectstorm_react_diagrams_routing___react_diagrams_routing_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_react_diagrams_routing___react_diagrams_routing_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/react-diagrams-routing/-/react-diagrams-routing-6.6.1.tgz"; + sha512 = "m8akJynhanxmpc/A2U7bcgFxIMxsjb3zmYBRGFltVJve87mir8ACaH2gmiHYcAfgEHxdh+x7mCuUlfNP242Ytw=="; + }; + } + { + name = "_projectstorm_react_diagrams___react_diagrams_6.6.1.tgz"; + path = fetchurl { + name = "_projectstorm_react_diagrams___react_diagrams_6.6.1.tgz"; + url = "https://registry.yarnpkg.com/@projectstorm/react-diagrams/-/react-diagrams-6.6.1.tgz"; + sha512 = "tLSXfEf/dGFUN8JCCRMrYyIBhhn+eVw24xQodmtcReJxQpKa31EWh9CmJ6UEg7xUnabMG9f2plOPyJqyFssGTA=="; + }; + } + { + name = "_simonwep_pickr___pickr_1.8.1.tgz"; + path = fetchurl { + name = "_simonwep_pickr___pickr_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@simonwep/pickr/-/pickr-1.8.1.tgz"; + sha512 = "3Q5+INWW0Py+/E9hgy0cyD0/0w/yGZbkxam6RzFVFDOEHgAqMVJR+x9znx58/ky/ZIvE/78FbH189yIC9h111A=="; + }; + } + { + name = "_sindresorhus_is___is_0.7.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; + }; + } + { + name = "_sphinxxxx_color_conversion___color_conversion_2.2.2.tgz"; + path = fetchurl { + name = "_sphinxxxx_color_conversion___color_conversion_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz"; + sha512 = "XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="; + }; + } + { + name = "_tippyjs_react___react_4.2.3.tgz"; + path = fetchurl { + name = "_tippyjs_react___react_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/@tippyjs/react/-/react-4.2.3.tgz"; + sha512 = "44vBapqROQI7Q5nDtX1MMAgcAV+3DsIi+m/45CxQ72C5LDNmNDq9h3f04x3NHMrUhWcfgfgjYA2EmeLSH/4eRg=="; + }; + } + { + name = "_tootallnate_once___once_1.1.2.tgz"; + path = fetchurl { + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + } + { + name = "_trysound_sax___sax_0.2.0.tgz"; + path = fetchurl { + name = "_trysound_sax___sax_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz"; + sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; + }; + } + { + name = "_types_classnames___classnames_2.3.1.tgz"; + path = fetchurl { + name = "_types_classnames___classnames_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz"; + sha512 = "zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A=="; + }; + } + { + name = "_types_component_emitter___component_emitter_1.2.10.tgz"; + path = fetchurl { + name = "_types_component_emitter___component_emitter_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz"; + sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + }; + } + { + name = "_types_cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "_types_cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz"; + sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + }; + } + { + name = "_types_cors___cors_2.8.10.tgz"; + path = fetchurl { + name = "_types_cors___cors_2.8.10.tgz"; + url = "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz"; + sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; + }; + } + { + name = "_types_eslint_scope___eslint_scope_3.7.0.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz"; + sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw=="; + }; + } + { + name = "_types_eslint___eslint_7.2.7.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_7.2.7.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.7.tgz"; + sha512 = "EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q=="; + }; + } + { + name = "_types_estree___estree_0.0.46.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.46.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz"; + sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; + }; + } + { + name = "_types_glob___glob_7.1.3.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + }; + } + { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + }; + } + { + name = "_types_minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="; + }; + } + { + name = "_types_node___node_14.14.32.tgz"; + path = fetchurl { + name = "_types_node___node_14.14.32.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz"; + sha512 = "/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg=="; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + }; + } + { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; + sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; + }; + } + { + name = "_types_q___q_1.5.4.tgz"; + path = fetchurl { + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + }; + } + { + name = "_types_react_dom___react_dom_16.9.14.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_16.9.14.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz"; + sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; + }; + } + { + name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; + path = fetchurl { + name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ=="; + }; + } + { + name = "_types_react___react_16.14.10.tgz"; + path = fetchurl { + name = "_types_react___react_16.14.10.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz"; + sha512 = "QadBsMyF6ldjEAXEhsmEW/L0uBDJT8yw7Qoe5sRnEKVrzMkiYoJwqoL5TKJOlArsn/wvIJM/XdVzkdL6+AS64Q=="; + }; + } + { + name = "_types_react___react_16.14.18.tgz"; + path = fetchurl { + name = "_types_react___react_16.14.18.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.18.tgz"; + sha512 = "eeyqd1mqoG43mI0TvNKy9QNf1Tjz3DEOsRP3rlPo35OeMIt05I+v9RR8ZvL2GuYZeF2WAcLXJZMzu6zdz3VbtQ=="; + }; + } + { + name = "_types_scheduler___scheduler_0.16.1.tgz"; + path = fetchurl { + name = "_types_scheduler___scheduler_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; + sha512 = "EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="; + }; + } + { + name = "_types_styled_jsx___styled_jsx_2.2.8.tgz"; + path = fetchurl { + name = "_types_styled_jsx___styled_jsx_2.2.8.tgz"; + url = "https://registry.yarnpkg.com/@types/styled-jsx/-/styled-jsx-2.2.8.tgz"; + sha512 = "Yjye9VwMdYeXfS71ihueWRSxrruuXTwKCbzue4+5b2rjnQ//AtyM7myZ1BEhNhBQ/nL/RE7bdToUoLln2miKvg=="; + }; + } + { + name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; + path = fetchurl { + name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz"; + sha512 = "0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw=="; + }; + } + { + name = "_webassemblyjs_ast___ast_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz"; + sha512 = "kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg=="; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz"; + sha512 = "Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA=="; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz"; + sha512 = "baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w=="; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz"; + sha512 = "u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA=="; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz"; + sha512 = "DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ=="; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz"; + sha512 = "MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA=="; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz"; + sha512 = "3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew=="; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz"; + sha512 = "KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA=="; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz"; + sha512 = "aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g=="; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz"; + sha512 = "A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw=="; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz"; + sha512 = "JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ=="; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz"; + sha512 = "BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ=="; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz"; + sha512 = "tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg=="; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz"; + sha512 = "6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw=="; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz"; + sha512 = "Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ=="; + }; + } + { + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; + sha512 = "WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw=="; + }; + } + { + name = "_webpack_cli_info___info_1.2.4.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz"; + sha512 = "ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g=="; + }; + } + { + name = "_webpack_cli_serve___serve_1.4.0.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz"; + sha512 = "xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg=="; + }; + } + { + name = "_wojtekmaj_enzyme_adapter_react_17___enzyme_adapter_react_17_0.4.1.tgz"; + path = fetchurl { + name = "_wojtekmaj_enzyme_adapter_react_17___enzyme_adapter_react_17_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.4.1.tgz"; + sha512 = "WZr8i4C6WVDV7Mb8sbm7GdlEPmk1f+xOMjUKThqrkWgwsfvu90zJyyX54wyAvsS91sjtKZ0JipGj2cJnEDaxPA=="; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + } + { + name = "FileSaver___FileSaver_0.10.0.tgz"; + path = fetchurl { + name = "FileSaver___FileSaver_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz"; + sha1 = "fe84iZREWAQu9d8ukGTIjj0igcc="; + }; + } + { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + } + { + name = "ace_builds___ace_builds_1.4.12.tgz"; + path = fetchurl { + name = "ace_builds___ace_builds_1.4.12.tgz"; + url = "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz"; + sha512 = "G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg=="; + }; + } + { + name = "jquery-aciTree.git"; + path = + let + repo = fetchgit { + url = "https://github.com/imsurinder90/jquery-aciTree.git"; + rev = "24dcd7536a008abe25da6adb7bfde8eeb53892f1"; + sha256 = "1y8kz70492x5i6fb7s6g5qgrwhv50jmzbqg0gdnyb5q0n0xypk4z"; + }; + in + runCommand "jquery-aciTree.git" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + }; + } + { + name = "acorn_node___acorn_node_1.8.2.tgz"; + path = fetchurl { + name = "acorn_node___acorn_node_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; + sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; + }; + } + { + name = "acorn_walk___acorn_walk_8.1.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.0.tgz"; + sha512 = "mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg=="; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + } + { + name = "acorn___acorn_8.2.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.2.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; + sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + } + { + name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; + sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + } + { + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; + path = fetchurl { + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz"; + sha512 = "7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg=="; + }; + } + { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + path = fetchurl { + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; + }; + } + { + name = "ajv___ajv_5.5.2.tgz"; + path = fetchurl { + name = "ajv___ajv_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz"; + sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU="; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + } + { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha512 = "Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ=="; + }; + } + { + name = "AlertifyJS"; + path = + let + repo = fetchgit { + url = "https://github.com/EnterpriseDB/AlertifyJS/"; + rev = "72c1d794f5b6d4ec13a68d123c08f19021afe263"; + sha256 = "08sbzwdba8sq5cpafymz0jjxay0b0hwnjkr8dr3iymjdy071ah9y"; + }; + in + runCommand "AlertifyJS" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + path = fetchurl { + name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; + sha1 = "l6ERlkmyEa0zaR2fn0hqjsn74KM="; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4="; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + } + { + name = "arch___arch_2.2.0.tgz"; + path = fetchurl { + name = "arch___arch_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + } + { + name = "archive_type___archive_type_4.0.0.tgz"; + path = fetchurl { + name = "archive_type___archive_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz"; + sha1 = "+S5yIzBW38aWlHJ0nCZ72wRrHXA="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + } + { + name = "array_includes___array_includes_3.1.3.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; + sha512 = "gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + } + { + name = "array.prototype.filter___array.prototype.filter_1.0.0.tgz"; + path = fetchurl { + name = "array.prototype.filter___array.prototype.filter_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz"; + sha512 = "TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ=="; + }; + } + { + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + path = fetchurl { + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg=="; + }; + } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; + sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; + }; + } + { + name = "asn1.js___asn1.js_5.4.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + }; + } + { + name = "aspen_core___aspen_core_1.0.4.tgz"; + path = fetchurl { + name = "aspen_core___aspen_core_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/aspen-core/-/aspen-core-1.0.4.tgz"; + sha512 = "mQ79JxHstB2rf47Zgw2yduAH9L47b+3bwQtpbEAKeSJsLTPe8X7lsQ6lLP3tFbS204TNILC5LxSkVWv45FXQYg=="; + }; + } + { + name = "aspen_decorations___aspen_decorations_1.1.1.tgz"; + path = fetchurl { + name = "aspen_decorations___aspen_decorations_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz"; + sha512 = "Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ=="; + }; + } + { + name = "aspen_tree_model___aspen_tree_model_1.0.5.tgz"; + path = fetchurl { + name = "aspen_tree_model___aspen_tree_model_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/aspen-tree-model/-/aspen-tree-model-1.0.5.tgz"; + sha512 = "kcdL22iAT1sp1HTQ3wJnQqSeA2ANSQiOZJ86RMk9tKBZjb5EFSs2khEFQ6iYE7bvHcWTarGzD7X8XKfxe/zxXg=="; + }; + } + { + name = "assert___assert_1.5.0.tgz"; + path = fetchurl { + name = "assert___assert_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + }; + } + { + name = "async___async_3.2.0.tgz"; + path = fetchurl { + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + }; + } + { + name = "autoprefixer___autoprefixer_10.2.6.tgz"; + path = fetchurl { + name = "autoprefixer___autoprefixer_10.2.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.6.tgz"; + sha512 = "8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg=="; + }; + } + { + name = "available_typed_arrays___available_typed_arrays_1.0.4.tgz"; + path = fetchurl { + name = "available_typed_arrays___available_typed_arrays_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz"; + sha512 = "SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="; + }; + } + { + name = "axios_mock_adapter___axios_mock_adapter_1.19.0.tgz"; + path = fetchurl { + name = "axios_mock_adapter___axios_mock_adapter_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz"; + sha512 = "D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg=="; + }; + } + { + name = "axios___axios_0.21.4.tgz"; + path = fetchurl { + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; + }; + } + { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + path = fetchurl { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "Y/1D99weO7fONZR9uP42mj9Yx0s="; + }; + } + { + name = "babel_generator___babel_generator_6.26.1.tgz"; + path = fetchurl { + name = "babel_generator___babel_generator_6.26.1.tgz"; + url = "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz"; + sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; + }; + } + { + name = "babel_loader___babel_loader_8.2.2.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; + }; + } + { + name = "babel_messages___babel_messages_6.23.0.tgz"; + path = fetchurl { + name = "babel_messages___babel_messages_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "8830cDhYA1sqKVHG7F7fbGLyYw4="; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; + }; + } + { + name = "babel_plugin_emotion___babel_plugin_emotion_10.2.2.tgz"; + path = fetchurl { + name = "babel_plugin_emotion___babel_plugin_emotion_10.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz"; + sha512 = "SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA=="; + }; + } + { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + path = fetchurl { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; + }; + } + { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz"; + sha512 = "DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA=="; + }; + } + { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz"; + sha512 = "u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw=="; + }; + } + { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz"; + sha512 = "OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg=="; + }; + } + { + name = "babel_plugin_styled_components___babel_plugin_styled_components_1.12.0.tgz"; + path = fetchurl { + name = "babel_plugin_styled_components___babel_plugin_styled_components_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz"; + sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA=="; + }; + } + { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "CvMqmm4Tyno/1QaeYtew9Y0NiUY="; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; + }; + } + { + name = "babel_template___babel_template_6.26.0.tgz"; + path = fetchurl { + name = "babel_template___babel_template_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "3gPi0WOWsGn0bdn/+FIfsaDjXgI="; + }; + } + { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + path = fetchurl { + name = "babel_traverse___babel_traverse_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "RqnL1+3MYsjlwGTi0tjQ9ANXZu4="; + }; + } + { + name = "babel_types___babel_types_6.26.0.tgz"; + path = fetchurl { + name = "babel_types___babel_types_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "o7Bz+Uq0nrb6Vc1lInozQ4BjJJc="; + }; + } + { + name = "babelify___babelify_10.0.0.tgz"; + path = fetchurl { + name = "babelify___babelify_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz"; + sha512 = "X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg=="; + }; + } + { + name = "babylon___babylon_6.18.0.tgz"; + path = fetchurl { + name = "babylon___babylon_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + }; + } + { + name = "backbone___backbone_1.3.3.tgz"; + path = fetchurl { + name = "backbone___backbone_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz"; + sha1 = "TMgOp8sWMaxHSInOQPL4vGg7KZk="; + }; + } + { + name = "backbone___backbone_1.4.0.tgz"; + path = fetchurl { + name = "backbone___backbone_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz"; + sha512 = "RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ=="; + }; + } + { + name = "backbone___backbone_1.2.3.tgz"; + path = fetchurl { + name = "backbone___backbone_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz"; + sha1 = "wiz9B/yG676uYdGJKe0RXpmdZbk="; + }; + } + { + name = "backform___backform_0.2.0.tgz"; + path = fetchurl { + name = "backform___backform_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz"; + sha1 = "sUy43rCMhj/FlaK8UFBm4yoq1M4="; + }; + } + { + name = "backgrid_filter___backgrid_filter_0.3.7.tgz"; + path = fetchurl { + name = "backgrid_filter___backgrid_filter_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz"; + sha1 = "1LGdDnBwE9fxgfnox/67SZfVbwM="; + }; + } + { + name = "backgrid_select_all___backgrid_select_all_0.3.5.tgz"; + path = fetchurl { + name = "backgrid_select_all___backgrid_select_all_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz"; + sha1 = "FDqADl2V/yrlqE14v0+6QflIHpQ="; + }; + } + { + name = "backgrid___backgrid_0.3.8.tgz"; + path = fetchurl { + name = "backgrid___backgrid_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz"; + sha1 = "fSaBZ0LXLIWcrTmxPxnJ8nuv/tc="; + }; + } + { + name = "backo2___backo2_1.0.2.tgz"; + path = fetchurl { + name = "backo2___backo2_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz"; + sha1 = "MasayLEpNjRj41s+u2n038+6eUc="; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + } + { + name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz"; + path = fetchurl { + name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; + sha1 = "mBjHngWbE1X5fgQooBfIOOkLqBI="; + }; + } + { + name = "base64_arraybuffer___base64_arraybuffer_0.2.0.tgz"; + path = fetchurl { + name = "base64_arraybuffer___base64_arraybuffer_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz"; + sha512 = "7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + } + { + name = "base64id___base64id_2.0.0.tgz"; + path = fetchurl { + name = "base64id___base64id_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz"; + sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + } + { + name = "bignumber.js___bignumber.js_7.2.1.tgz"; + path = fetchurl { + name = "bignumber.js___bignumber.js_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz"; + sha512 = "S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="; + }; + } + { + name = "bignumber.js___bignumber.js_9.0.1.tgz"; + path = fetchurl { + name = "bignumber.js___bignumber.js_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz"; + sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="; + }; + } + { + name = "bin_build___bin_build_3.0.0.tgz"; + path = fetchurl { + name = "bin_build___bin_build_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz"; + sha512 = "jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA=="; + }; + } + { + name = "bin_check___bin_check_4.1.0.tgz"; + path = fetchurl { + name = "bin_check___bin_check_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz"; + sha512 = "b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA=="; + }; + } + { + name = "bin_version_check___bin_version_check_4.0.0.tgz"; + path = fetchurl { + name = "bin_version_check___bin_version_check_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-4.0.0.tgz"; + sha512 = "sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ=="; + }; + } + { + name = "bin_version___bin_version_3.1.0.tgz"; + path = fetchurl { + name = "bin_version___bin_version_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bin-version/-/bin-version-3.1.0.tgz"; + sha512 = "Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ=="; + }; + } + { + name = "bin_wrapper___bin_wrapper_4.1.0.tgz"; + path = fetchurl { + name = "bin_wrapper___bin_wrapper_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-4.1.0.tgz"; + sha512 = "hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q=="; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + } + { + name = "bl___bl_1.2.3.tgz"; + path = fetchurl { + name = "bl___bl_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz"; + sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; + }; + } + { + name = "bn.js___bn.js_4.12.0.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; + }; + } + { + name = "bn.js___bn.js_5.2.0.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; + sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + } + { + name = "boolbase___boolbase_1.0.0.tgz"; + path = fetchurl { + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; + }; + } + { + name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; + path = fetchurl { + name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz"; + sha512 = "9rYYbaVOheGYxjOr/+bJCmRPihfy+LkLSg4fIFMT9Od8WwWB/MB50w0JO1eBgKUMbb7PFHQD5uAfI3ArAxZRXA=="; + }; + } + { + name = "bootstrap4_toggle___bootstrap4_toggle_3.6.1.tgz"; + path = fetchurl { + name = "bootstrap4_toggle___bootstrap4_toggle_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap4-toggle/-/bootstrap4-toggle-3.6.1.tgz"; + sha512 = "eRejcTc9YurhZ64nHY9Ii9DQn+F9/R74H9RPoeANVM3N1+C2lZ2tUuFCx1w3orOJ1y/iG4A7iCwdDZphMDIrYg=="; + }; + } + { + name = "bootstrap___bootstrap_4.6.0.tgz"; + path = fetchurl { + name = "bootstrap___bootstrap_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz"; + sha512 = "Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw=="; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + } + { + name = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; + }; + } + { + name = "browser_pack___browser_pack_6.1.0.tgz"; + path = fetchurl { + name = "browser_pack___browser_pack_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; + }; + } + { + name = "browser_resolve___browser_resolve_2.0.0.tgz"; + path = fetchurl { + name = "browser_resolve___browser_resolve_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-2.0.0.tgz"; + sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ=="; + }; + } + { + name = "browserfs___browserfs_1.4.3.tgz"; + path = fetchurl { + name = "browserfs___browserfs_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/browserfs/-/browserfs-1.4.3.tgz"; + sha512 = "tz8HClVrzTJshcyIu8frE15cjqjcBIu15Bezxsvl/i+6f59iNCN3kznlWjz0FEb3DlnDx3gW5szxeT6D1x0s0w=="; + }; + } + { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + }; + } + { + name = "browserify_des___browserify_des_1.0.2.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + path = fetchurl { + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; + }; + } + { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + }; + } + { + name = "browserify___browserify_17.0.0.tgz"; + path = fetchurl { + name = "browserify___browserify_17.0.0.tgz"; + url = "https://registry.yarnpkg.com/browserify/-/browserify-17.0.0.tgz"; + sha512 = "SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w=="; + }; + } + { + name = "browserslist___browserslist_4.16.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; + }; + } + { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + path = fetchurl { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + }; + } + { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + path = fetchurl { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; + }; + } + { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + path = fetchurl { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "JuYe0UIvtw3ULm42cp7VHYVf6Nk="; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + } + { + name = "buffer___buffer_6.0.3.tgz"; + path = fetchurl { + name = "buffer___buffer_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz"; + sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="; + }; + } + { + name = "buffer___buffer_5.2.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; + }; + } + { + name = "bufferstreams___bufferstreams_3.0.0.tgz"; + path = fetchurl { + name = "bufferstreams___bufferstreams_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-3.0.0.tgz"; + sha512 = "Qg0ggJUWJq90vtg4lDsGN9CDWvzBMQxhiEkSOD/sJfYt6BLect3eV1/S6K7SCSKJ34n60rf6U5eUPmQENVE4UA=="; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "hZgoeOIbmOHGZCXgPQF0eI9Wnug="; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + } + { + name = "cacache___cacache_15.3.0.tgz"; + path = fetchurl { + name = "cacache___cacache_15.3.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + }; + } + { + name = "cacheable_request___cacheable_request_2.1.4.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "DYCIAbY0KtM8kd+dC0TcCbkeXD0="; + }; + } + { + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; + path = fetchurl { + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; + sha1 = "hlV23+85wNan3v3nlNB49TCOPvM="; + }; + } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + } + { + name = "camelize___camelize_1.0.0.tgz"; + path = fetchurl { + name = "camelize___camelize_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz"; + sha1 = "FkpUg+Yw+kMh5a8HAg5TGDGyYJs="; + }; + } + { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + path = fetchurl { + name = "caniuse_api___caniuse_api_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001230.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; + sha512 = "5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="; + }; + } + { + name = "caw___caw_2.0.1.tgz"; + path = fetchurl { + name = "caw___caw_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz"; + sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg="; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + } + { + name = "chart.js___chart.js_2.9.4.tgz"; + path = fetchurl { + name = "chart.js___chart.js_2.9.4.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz"; + sha512 = "B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A=="; + }; + } + { + name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; + path = fetchurl { + name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; + sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; + }; + } + { + name = "chartjs_color___chartjs_color_2.4.1.tgz"; + path = fetchurl { + name = "chartjs_color___chartjs_color_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz"; + sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; + }; + } + { + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + path = fetchurl { + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz"; + sha512 = "sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew=="; + }; + } + { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + path = fetchurl { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz"; + sha512 = "QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng=="; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + }; + } + { + name = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + }; + } + { + name = "circular_json_es6___circular_json_es6_2.0.2.tgz"; + path = fetchurl { + name = "circular_json_es6___circular_json_es6_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/circular-json-es6/-/circular-json-es6-2.0.2.tgz"; + sha512 = "ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ=="; + }; + } + { + name = "classnames___classnames_2.3.1.tgz"; + path = fetchurl { + name = "classnames___classnames_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; + sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + name = "closest___closest_0.0.1.tgz"; + path = fetchurl { + name = "closest___closest_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz"; + sha1 = "JtpvgLPg4X5x+A8SeCgZ6fZTSVw="; + }; + } + { + name = "clsx___clsx_1.1.1.tgz"; + path = fetchurl { + name = "clsx___clsx_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz"; + sha512 = "6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="; + }; + } + { + name = "co___co_4.6.0.tgz"; + path = fetchurl { + name = "co___co_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; + sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; + }; + } + { + name = "coa___coa_2.0.2.tgz"; + path = fetchurl { + name = "coa___coa_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; + }; + } + { + name = "codemirror___codemirror_5.59.4.tgz"; + path = fetchurl { + name = "codemirror___codemirror_5.59.4.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.59.4.tgz"; + sha512 = "achw5JBgx8QPcACDDn+EUUXmCYzx/zxEtOGXyjvLEvYY8GleUrnfm5D+Zb+UjShHggXKDT9AXrbkBZX6a0YSQg=="; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + } + { + name = "colord___colord_2.0.0.tgz"; + path = fetchurl { + name = "colord___colord_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/colord/-/colord-2.0.0.tgz"; + sha512 = "WMDFJfoY3wqPZNpKUFdse3HhD5BHCbE9JCdxRzoVH+ywRITGOeWAHNkGEmyxLlErEpN9OLMWgdM9dWQtDk5dog=="; + }; + } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + } + { + name = "combine_source_map___combine_source_map_0.8.0.tgz"; + path = fetchurl { + name = "combine_source_map___combine_source_map_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "pY0N8ELBhvz4IqjoAV9UUNLXmos="; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + } + { + name = "commander___commander_4.1.1.tgz"; + path = fetchurl { + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + } + { + name = "commander___commander_6.2.1.tgz"; + path = fetchurl { + name = "commander___commander_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; + }; + } + { + name = "commander___commander_7.1.0.tgz"; + path = fetchurl { + name = "commander___commander_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz"; + sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="; + }; + } + { + name = "commander___commander_7.2.0.tgz"; + path = fetchurl { + name = "commander___commander_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; + sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "3dgA2gxmEnOTzKWVDqloo6rxJTs="; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + } + { + name = "config_chain___config_chain_1.1.12.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + }; + } + { + name = "connect___connect_3.7.0.tgz"; + path = fetchurl { + name = "connect___connect_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz"; + sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; + }; + } + { + name = "console_browserify___console_browserify_1.2.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "wguW2MYXdIqvHBYCF2DNJ/y4y3U="; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + } + { + name = "context_menu___context_menu_2.0.0.tgz"; + path = fetchurl { + name = "context_menu___context_menu_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz"; + sha512 = "VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg=="; + }; + } + { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + }; + } + { + name = "convert_source_map___convert_source_map_1.1.3.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "SCnId+n+SbMWHzvzZziI4gRpmGA="; + }; + } + { + name = "cookie___cookie_0.4.1.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_7.0.0.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-7.0.0.tgz"; + sha512 = "SLjQNa5iE3BoCP76ESU9qYo9ZkEWtXoZxDurHoqPchAFRblJ9g96xTeC560UXBMre1Nx6ixIIUfiY3VcjpJw3g=="; + }; + } + { + name = "core_js_compat___core_js_compat_3.9.1.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz"; + sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA=="; + }; + } + { + name = "core_js___core_js_2.6.12.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; + }; + } + { + name = "core_js___core_js_3.12.1.tgz"; + path = fetchurl { + name = "core_js___core_js_3.12.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz"; + sha512 = "Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw=="; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; + }; + } + { + name = "cors___cors_2.8.5.tgz"; + path = fetchurl { + name = "cors___cors_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; + }; + } + { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; + }; + } + { + name = "create_hash___create_hash_1.2.0.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + }; + } + { + name = "create_hmac___create_hmac_1.1.7.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + }; + } + { + name = "cross_env___cross_env_7.0.3.tgz"; + path = fetchurl { + name = "cross_env___cross_env_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz"; + sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "6L0O/uWPz/b4+UUQoKVUu/ojVEk="; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + }; + } + { + name = "css_color_keywords___css_color_keywords_1.0.0.tgz"; + path = fetchurl { + name = "css_color_keywords___css_color_keywords_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz"; + sha1 = "/qJhbcZ2spYmhrOvjb2+GAskTgU="; + }; + } + { + name = "css_color_names___css_color_names_0.0.4.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; + sha1 = "gIrcLnnPhHOAabZGyyDsJ762KeA="; + }; + } + { + name = "css_color_names___css_color_names_1.0.1.tgz"; + path = fetchurl { + name = "css_color_names___css_color_names_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz"; + sha512 = "/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA=="; + }; + } + { + name = "css_declaration_sorter___css_declaration_sorter_6.0.3.tgz"; + path = fetchurl { + name = "css_declaration_sorter___css_declaration_sorter_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.0.3.tgz"; + sha512 = "52P95mvW1SMzuRZegvpluT6yEv0FqQusydKQPZsNN5Q7hh8EwQvN8E2nwuJ16BBvNN6LcoIZXu/Bk58DAhrrxw=="; + }; + } + { + name = "css_line_break___css_line_break_1.1.1.tgz"; + path = fetchurl { + name = "css_line_break___css_line_break_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz"; + sha512 = "1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA=="; + }; + } + { + name = "css_loader___css_loader_5.1.1.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.1.1.tgz"; + sha512 = "5FfhpjwtuRgxqmusDidowqmLlcb+1HgnEDMsi2JhiUrZUcoc+cqw+mUtMIF/+OfeMYaaFCLYp1TaIt9H6I/fKA=="; + }; + } + { + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.0.0.tgz"; + path = fetchurl { + name = "css_minimizer_webpack_plugin___css_minimizer_webpack_plugin_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.0.tgz"; + sha512 = "yIrqG0pPphR1RoNx2wDxYmxRf2ubRChLDXxv7ccipEm5bRKsZRYp8n+2peeXehtTF5s3yNxlqsdz3WQOsAgUkw=="; + }; + } + { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + path = fetchurl { + name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; + }; + } + { + name = "css_select___css_select_2.1.0.tgz"; + path = fetchurl { + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; + }; + } + { + name = "css_select___css_select_4.1.3.tgz"; + path = fetchurl { + name = "css_select___css_select_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz"; + sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; + }; + } + { + name = "css_to_react_native___css_to_react_native_3.0.0.tgz"; + path = fetchurl { + name = "css_to_react_native___css_to_react_native_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz"; + sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ=="; + }; + } + { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; + }; + } + { + name = "css_tree___css_tree_1.1.3.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; + sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; + }; + } + { + name = "css_vendor___css_vendor_2.0.8.tgz"; + path = fetchurl { + name = "css_vendor___css_vendor_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz"; + sha512 = "x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ=="; + }; + } + { + name = "css_what___css_what_3.4.2.tgz"; + path = fetchurl { + name = "css_what___css_what_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; + sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; + }; + } + { + name = "css_what___css_what_5.1.0.tgz"; + path = fetchurl { + name = "css_what___css_what_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz"; + sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + } + { + name = "cssnano_preset_default___cssnano_preset_default_5.1.1.tgz"; + path = fetchurl { + name = "cssnano_preset_default___cssnano_preset_default_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.1.tgz"; + sha512 = "kAhR71Tascmnjlhl4UegGA3KGGbMLXHkkqVpA9idsRT1JmIhIsz1C3tDpBeQMUw5EX5Rfb1HGc/PRqD2AFk3Vg=="; + }; + } + { + name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; + path = fetchurl { + name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz"; + sha512 = "i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ=="; + }; + } + { + name = "cssnano___cssnano_5.0.4.tgz"; + path = fetchurl { + name = "cssnano___cssnano_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.4.tgz"; + sha512 = "I+fDW74CJ4yb31765ov9xXe70XLZvFTXjwhmA//VgAAuSAU34Oblbe94Q9zffiCX1VhcSfQWARQnwhz+Nqgb4Q=="; + }; + } + { + name = "csso___csso_4.2.0.tgz"; + path = fetchurl { + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; + }; + } + { + name = "csstype___csstype_2.6.16.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.16.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz"; + sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; + }; + } + { + name = "csstype___csstype_3.0.8.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha512 = "jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="; + }; + } + { + name = "cubic2quad___cubic2quad_1.2.1.tgz"; + path = fetchurl { + name = "cubic2quad___cubic2quad_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz"; + sha512 = "wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ=="; + }; + } + { + name = "custom_event___custom_event_1.0.1.tgz"; + path = fetchurl { + name = "custom_event___custom_event_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz"; + sha1 = "XQKkaFCt8bSjF5RqOSj8y1v9BCU="; + }; + } + { + name = "dagre___dagre_0.8.5.tgz"; + path = fetchurl { + name = "dagre___dagre_0.8.5.tgz"; + url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz"; + sha512 = "/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw=="; + }; + } + { + name = "dash_ast___dash_ast_1.0.0.tgz"; + path = fetchurl { + name = "dash_ast___dash_ast_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + } + { + name = "date_fns___date_fns_2.24.0.tgz"; + path = fetchurl { + name = "date_fns___date_fns_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz"; + sha512 = "6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw=="; + }; + } + { + name = "date_format___date_format_4.0.3.tgz"; + path = fetchurl { + name = "date_format___date_format_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz"; + sha1 = "9j3l3AjcAu/Y7zK/KmkY5IbzWHM="; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + }; + } + { + name = "debug___debug_4.3.3.tgz"; + path = fetchurl { + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha1 = "BCZuC3CpjURi5uKI44JZITMytmQ="; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "decompress_tar___decompress_tar_4.1.1.tgz"; + path = fetchurl { + name = "decompress_tar___decompress_tar_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; + }; + } + { + name = "decompress_tarbz2___decompress_tarbz2_4.1.1.tgz"; + path = fetchurl { + name = "decompress_tarbz2___decompress_tarbz2_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; + }; + } + { + name = "decompress_targz___decompress_targz_4.1.1.tgz"; + path = fetchurl { + name = "decompress_targz___decompress_targz_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; + }; + } + { + name = "decompress_unzip___decompress_unzip_4.0.1.tgz"; + path = fetchurl { + name = "decompress_unzip___decompress_unzip_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "3qrM39FK6vhVePczroIQ+bSEj2k="; + }; + } + { + name = "decompress___decompress_4.2.1.tgz"; + path = fetchurl { + name = "decompress___decompress_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz"; + sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; + }; + } + { + name = "deep_diff___deep_diff_1.0.2.tgz"; + path = fetchurl { + name = "deep_diff___deep_diff_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz"; + sha512 = "aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg=="; + }; + } + { + name = "deep_equal_ident___deep_equal_ident_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal_ident___deep_equal_ident_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz"; + sha1 = "BvS4nlNxDNbOpKd4HHqVZkLejck="; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + } + { + name = "defined___defined_1.0.0.tgz"; + path = fetchurl { + name = "defined___defined_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; + sha1 = "yY2bzvdWdBiOEQlpFRGZ45sfppM="; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; + }; + } + { + name = "deps_sort___deps_sort_2.0.1.tgz"; + path = fetchurl { + name = "deps_sort___deps_sort_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz"; + sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw=="; + }; + } + { + name = "des.js___des.js_1.0.1.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; + }; + } + { + name = "detect_indent___detect_indent_4.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "920GQ1LN9Docts5hnE7jqUdd4gg="; + }; + } + { + name = "detective___detective_5.2.0.tgz"; + path = fetchurl { + name = "detective___detective_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; + }; + } + { + name = "di___di_0.0.1.tgz"; + path = fetchurl { + name = "di___di_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz"; + sha1 = "gGZJMmzqp8qjMG112YXqJ0i6kTw="; + }; + } + { + name = "diff_arrays_of_objects___diff_arrays_of_objects_1.1.8.tgz"; + path = fetchurl { + name = "diff_arrays_of_objects___diff_arrays_of_objects_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/diff-arrays-of-objects/-/diff-arrays-of-objects-1.1.8.tgz"; + sha512 = "OAaiDlQRiv5+EASUpwNSDa/sWyKHKvODQfah1CAx0dosR8OWXedFXgxAQHIdeWDobZ86D6g93BfK2X9ECIRuqw=="; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + } + { + name = "discontinuous_range___discontinuous_range_1.0.0.tgz"; + path = fetchurl { + name = "discontinuous_range___discontinuous_range_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; + sha1 = "44Mx8IRLukm5qctxx3FYWqsbxlo="; + }; + } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + } + { + name = "dom_helpers___dom_helpers_5.2.0.tgz"; + path = fetchurl { + name = "dom_helpers___dom_helpers_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz"; + sha512 = "Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ=="; + }; + } + { + name = "dom_serialize___dom_serialize_2.2.1.tgz"; + path = fetchurl { + name = "dom_serialize___dom_serialize_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz"; + sha1 = "ViromZ9Evl6jB29UGdzVnrQ6yVs="; + }; + } + { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + }; + } + { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + }; + } + { + name = "domain_browser___domain_browser_1.2.0.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + }; + } + { + name = "domelementtype___domelementtype_1.3.1.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + } + { + name = "domelementtype___domelementtype_2.2.0.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + }; + } + { + name = "domhandler___domhandler_4.2.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz"; + sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; + }; + } + { + name = "domutils___domutils_1.7.0.tgz"; + path = fetchurl { + name = "domutils___domutils_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + }; + } + { + name = "domutils___domutils_2.6.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz"; + sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + }; + } + { + name = "download___download_6.2.5.tgz"; + path = fetchurl { + name = "download___download_6.2.5.tgz"; + url = "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz"; + sha512 = "DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA=="; + }; + } + { + name = "download___download_7.1.0.tgz"; + path = fetchurl { + name = "download___download_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz"; + sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; + }; + } + { + name = "dropzone___dropzone_5.9.3.tgz"; + path = fetchurl { + name = "dropzone___dropzone_5.9.3.tgz"; + url = "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz"; + sha512 = "Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="; + }; + } + { + name = "duplexer2___duplexer2_0.1.4.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "ixLauHjA1p4+eJEFFmKjL8a93ME="; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; + }; + } + { + name = "duplexer___duplexer_0.1.2.tgz"; + path = fetchurl { + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; + }; + } + { + name = "ejs___ejs_3.1.6.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.740.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.740.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz"; + sha512 = "Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg=="; + }; + } + { + name = "elliptic___elliptic_6.5.4.tgz"; + path = fetchurl { + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; + }; + } + { + name = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + } + { + name = "engine.io_client___engine.io_client_5.1.1.tgz"; + path = fetchurl { + name = "engine.io_client___engine.io_client_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-5.1.1.tgz"; + sha512 = "jPFpw2HLL0lhZ2KY0BpZhIJdleQcUO9W1xkIpo0h3d6s+5D6+EV/xgQw9qWOmymszv2WXef/6KUUehyxEKomlQ=="; + }; + } + { + name = "engine.io_parser___engine.io_parser_4.0.2.tgz"; + path = fetchurl { + name = "engine.io_parser___engine.io_parser_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz"; + sha512 = "sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg=="; + }; + } + { + name = "engine.io___engine.io_4.1.2.tgz"; + path = fetchurl { + name = "engine.io___engine.io_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.2.tgz"; + sha1 = "+WzrVtSznMfKW9KaIOnJnBrRp2U="; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha512 = "F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA=="; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + } + { + name = "ent___ent_2.2.0.tgz"; + path = fetchurl { + name = "ent___ent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz"; + sha1 = "6WQhkyWiHQX0RGai9obtbOX13R0="; + }; + } + { + name = "entities___entities_2.2.0.tgz"; + path = fetchurl { + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + } + { + name = "env_paths___env_paths_2.2.1.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; + }; + } + { + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; + path = fetchurl { + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz"; + sha512 = "F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg=="; + }; + } + { + name = "enzyme_matchers___enzyme_matchers_7.1.2.tgz"; + path = fetchurl { + name = "enzyme_matchers___enzyme_matchers_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-7.1.2.tgz"; + sha512 = "03WqAg2XDl7id9rARIO97HQ1JIw9F2heJ3R4meGu/13hx0ULTDEgl0E67MGl2Uq1jq1DyRnJfto1/VSzskdV5A=="; + }; + } + { + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz"; + path = fetchurl { + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz"; + sha512 = "MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q=="; + }; + } + { + name = "enzyme___enzyme_3.11.0.tgz"; + path = fetchurl { + name = "enzyme___enzyme_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz"; + sha512 = "Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw=="; + }; + } + { + name = "err_code___err_code_2.0.3.tgz"; + path = fetchurl { + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + } + { + name = "es_abstract___es_abstract_1.18.2.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.2.tgz"; + sha512 = "byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw=="; + }; + } + { + name = "es_array_method_boxes_properly___es_array_method_boxes_properly_1.0.0.tgz"; + path = fetchurl { + name = "es_array_method_boxes_properly___es_array_method_boxes_properly_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; + sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; + }; + } + { + name = "es_module_lexer___es_module_lexer_0.4.1.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz"; + sha512 = "ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA=="; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + }; + } + { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + path = fetchurl { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz"; + sha512 = "XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA=="; + }; + } + { + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; + sha512 = "AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw=="; + }; + } + { + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + path = fetchurl { + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; + sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + } + { + name = "eslint___eslint_7.21.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.21.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; + sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg=="; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + } + { + name = "eve___eve_0.5.4.tgz"; + path = fetchurl { + name = "eve___eve_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz"; + sha1 = "Z9CAuXJSkdfjieNMJoYN2X8d66o="; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + }; + } + { + name = "exec_buffer___exec_buffer_3.2.0.tgz"; + path = fetchurl { + name = "exec_buffer___exec_buffer_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.2.0.tgz"; + sha512 = "wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA=="; + }; + } + { + name = "execa___execa_0.7.0.tgz"; + path = fetchurl { + name = "execa___execa_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; + sha1 = "lEvs00zEHuMqY6n68nrVpl/Fl3c="; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + } + { + name = "execa___execa_4.1.0.tgz"; + path = fetchurl { + name = "execa___execa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; + }; + } + { + name = "execa___execa_5.0.0.tgz"; + path = fetchurl { + name = "execa___execa_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + }; + } + { + name = "executable___executable_4.1.1.tgz"; + path = fetchurl { + name = "executable___executable_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz"; + sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; + }; + } + { + name = "exports_loader___exports_loader_2.0.0.tgz"; + path = fetchurl { + name = "exports_loader___exports_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-2.0.0.tgz"; + sha512 = "k/VFrVEUmotfkk8vZ+njG5NEXpr5Ee+BonV+AYINV2hNo3o+/UB8nEuCUQk2k6IyWIoobmXoTFO0igxrQcMV4Q=="; + }; + } + { + name = "ext_list___ext_list_2.2.2.tgz"; + path = fetchurl { + name = "ext_list___ext_list_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz"; + sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA=="; + }; + } + { + name = "ext_name___ext_name_5.0.0.tgz"; + path = fetchurl { + name = "ext_name___ext_name_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz"; + sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ="; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + } + { + name = "fast_glob___fast_glob_3.2.5.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + }; + } + { + name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + path = fetchurl { + name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + }; + } + { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; + sha512 = "4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg=="; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + } + { + name = "fastq___fastq_1.11.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; + }; + } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + } + { + name = "file_type___file_type_5.2.0.tgz"; + path = fetchurl { + name = "file_type___file_type_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz"; + sha1 = "LdvqfHP/42No365J3DOMBYwritY="; + }; + } + { + name = "file_type___file_type_12.4.2.tgz"; + path = fetchurl { + name = "file_type___file_type_12.4.2.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz"; + sha512 = "UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg=="; + }; + } + { + name = "file_type___file_type_3.9.0.tgz"; + path = fetchurl { + name = "file_type___file_type_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"; + sha1 = "JXoHg4TR24CHvESdEH1SpSZyuek="; + }; + } + { + name = "file_type___file_type_4.4.0.tgz"; + path = fetchurl { + name = "file_type___file_type_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz"; + sha1 = "G2AOX8ofvcboDApwxxyNul95BsU="; + }; + } + { + name = "file_type___file_type_6.2.0.tgz"; + path = fetchurl { + name = "file_type___file_type_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz"; + sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; + }; + } + { + name = "file_type___file_type_8.1.0.tgz"; + path = fetchurl { + name = "file_type___file_type_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz"; + sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + } + { + name = "filelist___filelist_1.0.2.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + }; + } + { + name = "filename_reserved_regex___filename_reserved_regex_2.0.0.tgz"; + path = fetchurl { + name = "filename_reserved_regex___filename_reserved_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "q/c9+rc10EVECr/qLZHzieu/oik="; + }; + } + { + name = "filenamify___filenamify_2.1.0.tgz"; + path = fetchurl { + name = "filenamify___filenamify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz"; + sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + } + { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + } + { + name = "find_versions___find_versions_3.2.0.tgz"; + path = fetchurl { + name = "find_versions___find_versions_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz"; + sha512 = "P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww=="; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + } + { + name = "flatted___flatted_3.1.1.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + }; + } + { + name = "flatted___flatted_3.2.5.tgz"; + path = fetchurl { + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha1 = "dshYT0/IQ9tkcCpr0Eq3qL1mbaM="; + }; + } + { + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; + }; + } + { + name = "foreach___foreach_2.0.5.tgz"; + path = fetchurl { + name = "foreach___foreach_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz"; + sha1 = "C+4AUBiusmDQo6865ljdATbsG5k="; + }; + } + { + name = "fraction.js___fraction.js_4.1.1.tgz"; + path = fetchurl { + name = "fraction.js___fraction.js_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.1.tgz"; + sha512 = "MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "i/tVAr3kpNNs/e6gB/zKIdfjgq8="; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + } + { + name = "fs_extra___fs_extra_10.0.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; + sha1 = "n/YbZV3eU/s0qC34S7IUzoAuF8E="; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + } + { + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; + path = fetchurl { + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz"; + sha512 = "iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ=="; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + }; + } + { + name = "functions_have_names___functions_have_names_1.2.2.tgz"; + path = fetchurl { + name = "functions_have_names___functions_have_names_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz"; + sha512 = "bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA=="; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; + }; + } + { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; + }; + } + { + name = "geometry_interfaces___geometry_interfaces_1.1.4.tgz"; + path = fetchurl { + name = "geometry_interfaces___geometry_interfaces_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz"; + sha512 = "qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA=="; + }; + } + { + name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; + path = fetchurl { + name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; + sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + } + { + name = "get_proxy___get_proxy_2.1.0.tgz"; + path = fetchurl { + name = "get_proxy___get_proxy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; + }; + } + { + name = "get_stream___get_stream_3.0.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="; + }; + } + { + name = "get_stream___get_stream_2.3.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "Xzj5PzRgCWZu4BUKBUFn+Rvdld4="; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "get_stream___get_stream_6.0.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + } + { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + } + { + name = "globals___globals_9.18.0.tgz"; + path = fetchurl { + name = "globals___globals_9.18.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; + sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; + }; + } + { + name = "globby___globby_10.0.2.tgz"; + path = fetchurl { + name = "globby___globby_10.0.2.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz"; + sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; + }; + } + { + name = "globby___globby_11.0.3.tgz"; + path = fetchurl { + name = "globby___globby_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + }; + } + { + name = "got___got_7.1.0.tgz"; + path = fetchurl { + name = "got___got_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz"; + sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw=="; + }; + } + { + name = "got___got_8.3.2.tgz"; + path = fetchurl { + name = "got___got_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + }; + } + { + name = "graphlib___graphlib_2.1.8.tgz"; + path = fetchurl { + name = "graphlib___graphlib_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz"; + sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; + }; + } + { + name = "gzip_size___gzip_size_6.0.0.tgz"; + path = fetchurl { + name = "gzip_size___gzip_size_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz"; + sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; + }; + } + { + name = "handlebars___handlebars_4.7.7.tgz"; + path = fetchurl { + name = "handlebars___handlebars_4.7.7.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE="; + }; + } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + }; + } + { + name = "has_cors___has_cors_1.1.0.tgz"; + path = fetchurl { + name = "has_cors___has_cors_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "XkdHk/fqmEPRu5nCPu9J/xJv/zk="; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + name = "has_symbol_support_x___has_symbol_support_x_1.4.2.tgz"; + path = fetchurl { + name = "has_symbol_support_x___has_symbol_support_x_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; + }; + } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + } + { + name = "has_to_string_tag_x___has_to_string_tag_x_1.4.1.tgz"; + path = fetchurl { + name = "has_to_string_tag_x___has_to_string_tag_x_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + } + { + name = "hash_base___hash_base_3.1.0.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; + }; + } + { + name = "hash.js___hash.js_1.1.7.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + } + { + name = "hat___hat_0.0.3.tgz"; + path = fetchurl { + name = "hat___hat_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz"; + sha1 = "uwFKnmSzeIrtgAWRdBPU/z1QLYo="; + }; + } + { + name = "heap___heap_0.2.5.tgz"; + path = fetchurl { + name = "heap___heap_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz"; + sha1 = "cTtlWQ68xA/L7q9V6FFpQJKzmvE="; + }; + } + { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + path = fetchurl { + name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; + }; + } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; + }; + } + { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsl_regex___hsl_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; + sha1 = "1JMwx4ntgZ4nakwNJy3/owsY/m4="; + }; + } + { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + path = fetchurl { + name = "hsla_regex___hsla_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; + sha1 = "wc56MWjIxmFAM6S194d/OyJfnDg="; + }; + } + { + name = "html_dom_parser___html_dom_parser_1.0.1.tgz"; + path = fetchurl { + name = "html_dom_parser___html_dom_parser_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-1.0.1.tgz"; + sha512 = "uKXISKlHzB/l9A08jrs2wseQJ9b864ZfEdmIZskj10cuP6HxCOMHSK0RdluV8NVQaWs0PwefN7d8wqG3jR0IbQ=="; + }; + } + { + name = "html_element_map___html_element_map_1.3.1.tgz"; + path = fetchurl { + name = "html_element_map___html_element_map_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.1.tgz"; + sha512 = "6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg=="; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.tgz"; + path = fetchurl { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; + }; + } + { + name = "html_react_parser___html_react_parser_1.2.7.tgz"; + path = fetchurl { + name = "html_react_parser___html_react_parser_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-1.2.7.tgz"; + sha512 = "gUUEgrZV0YaCxtZO2XuJDUnHSq7gOqKu1krye97cxgiZ+ipaIzspGMhATeq9lhy9gwYmwBF2YCHe/accrMMo8Q=="; + }; + } + { + name = "html2canvas___html2canvas_1.0.0_rc.7.tgz"; + path = fetchurl { + name = "html2canvas___html2canvas_1.0.0_rc.7.tgz"; + url = "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz"; + sha512 = "yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA=="; + }; + } + { + name = "htmlescape___htmlescape_1.1.1.tgz"; + path = fetchurl { + name = "htmlescape___htmlescape_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "OgPtwiFLyjtmQko+eVk0lQnLA1E="; + }; + } + { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.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_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + } + { + name = "http_proxy___http_proxy_1.18.1.tgz"; + path = fetchurl { + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; + }; + } + { + name = "https_browserify___https_browserify_1.0.0.tgz"; + path = fetchurl { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "7AbBDgo0wPL68Zn3/X/Hj//QPHM="; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + } + { + name = "human_signals___human_signals_1.1.1.tgz"; + path = fetchurl { + name = "human_signals___human_signals_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + }; + } + { + name = "human_signals___human_signals_2.1.0.tgz"; + path = fetchurl { + name = "human_signals___human_signals_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "xG4xWaKT9riW2ikxbYtv6Lt5u+0="; + }; + } + { + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; + path = fetchurl { + name = "hyphenate_style_name___hyphenate_style_name_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz"; + sha512 = "ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + } + { + name = "icss_utils___icss_utils_5.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + } + { + name = "image_minimizer_webpack_plugin___image_minimizer_webpack_plugin_2.2.0.tgz"; + path = fetchurl { + name = "image_minimizer_webpack_plugin___image_minimizer_webpack_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-2.2.0.tgz"; + sha512 = "/BpKvjbfj9A+au7FryzHmj+1g3h2NzQ0w4nrXTU5YcQIGotvG69A5xyFL9Mq1htI9E8dI4rMF/wUc0klZLb1pg=="; + }; + } + { + name = "imagemin_mozjpeg___imagemin_mozjpeg_9.0.0.tgz"; + path = fetchurl { + name = "imagemin_mozjpeg___imagemin_mozjpeg_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-9.0.0.tgz"; + sha512 = "TwOjTzYqCFRgROTWpVSt5UTT0JeCuzF1jswPLKALDd89+PmrJ2PdMMYeDLYZ1fs9cTovI9GJd68mRSnuVt691w=="; + }; + } + { + name = "imagemin_optipng___imagemin_optipng_8.0.0.tgz"; + path = fetchurl { + name = "imagemin_optipng___imagemin_optipng_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-8.0.0.tgz"; + sha512 = "CUGfhfwqlPjAC0rm8Fy+R2DJDBGjzy2SkfyT09L8rasnF9jSoHFqJ1xxSZWK6HVPZBMhGPMxCTL70OgTHlLF5A=="; + }; + } + { + name = "imagemin_pngquant___imagemin_pngquant_9.0.2.tgz"; + path = fetchurl { + name = "imagemin_pngquant___imagemin_pngquant_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-9.0.2.tgz"; + sha512 = "cj//bKo8+Frd/DM8l6Pg9pws1pnDUjgb7ae++sUX1kUVdv2nrngPykhiUOgFeE0LGY/LmUbCf4egCHC4YUcZSg=="; + }; + } + { + name = "imagemin_svgo___imagemin_svgo_8.0.0.tgz"; + path = fetchurl { + name = "imagemin_svgo___imagemin_svgo_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-8.0.0.tgz"; + sha512 = "++fDnnxsLT+4rpt8babwiIbzapgBzeS2Kgcy+CwgBvgSRFltBFhX2WnpCziMtxhRCzqJcCE9EcHWZP/sj+G3rQ=="; + }; + } + { + name = "imagemin___imagemin_7.0.1.tgz"; + path = fetchurl { + name = "imagemin___imagemin_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.1.tgz"; + sha512 = "33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w=="; + }; + } + { + name = "immutability_helper___immutability_helper_3.1.1.tgz"; + path = fetchurl { + name = "immutability_helper___immutability_helper_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz"; + sha512 = "Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + } + { + name = "import_lazy___import_lazy_3.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz"; + sha512 = "8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ=="; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA=="; + }; + } + { + name = "imports_loader___imports_loader_2.0.0.tgz"; + path = fetchurl { + name = "imports_loader___imports_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-2.0.0.tgz"; + sha512 = "ZwEx0GfsJ1QckGqHSS1uu1sjpUgT3AYFOr3nT07dVnfeyc/bOICSw48067hr0u7DW8TZVzNVvdnvA62U9lG8nQ=="; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + }; + } + { + name = "indefinite_observable___indefinite_observable_2.0.1.tgz"; + path = fetchurl { + name = "indefinite_observable___indefinite_observable_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz"; + sha512 = "G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ=="; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "sX0I0ya0Qj5Wjv9xn5GwscvfafE="; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + } + { + name = "inline_source_map___inline_source_map_0.6.2.tgz"; + path = fetchurl { + name = "inline_source_map___inline_source_map_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "+Tk0ccGKedFyT4Y/o4tYY3Ct4qU="; + }; + } + { + name = "inline_style_parser___inline_style_parser_0.1.1.tgz"; + path = fetchurl { + name = "inline_style_parser___inline_style_parser_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz"; + sha512 = "7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="; + }; + } + { + name = "insert_if___insert_if_1.2.0.tgz"; + path = fetchurl { + name = "insert_if___insert_if_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/insert-if/-/insert-if-1.2.0.tgz"; + sha512 = "UFXvgVVosbyfa7tsowU8nOLHp/fGe7oGi5vYMy9wEQio8olkf+P7sHssmYnUe991du5EDlD+n/5cW17WgM7Cog=="; + }; + } + { + name = "insert_module_globals___insert_module_globals_7.2.1.tgz"; + path = fetchurl { + name = "insert_module_globals___insert_module_globals_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz"; + sha512 = "ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg=="; + }; + } + { + name = "internal_slot___internal_slot_1.0.3.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + } + { + name = "interpret___interpret_2.2.0.tgz"; + path = fetchurl { + name = "interpret___interpret_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz"; + sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; + }; + } + { + name = "into_stream___into_stream_3.1.0.tgz"; + path = fetchurl { + name = "into_stream___into_stream_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "lvsKk2wSur1v8XUqF9BWFqvQlMY="; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; + }; + } + { + name = "ip_address___ip_address_7.1.0.tgz"; + path = fetchurl { + name = "ip_address___ip_address_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-address/-/ip-address-7.1.0.tgz"; + sha512 = "V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ=="; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "vd7XARQpCCjAoDnnLvJfWq7ENUo="; + }; + } + { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; + }; + } + { + name = "is_any_array___is_any_array_1.0.0.tgz"; + path = fetchurl { + name = "is_any_array___is_any_array_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-any-array/-/is-any-array-1.0.0.tgz"; + sha512 = "0o0ZsgObnylv72nO39P6M+PL7jPUEx39O6BEfZuX36IKPy/RpdudxluAIaRn/LZi5eVPDMlMBaLABzOK6bwPlw=="; + }; + } + { + name = "is_arguments___is_arguments_1.1.0.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz"; + sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; + }; + } + { + name = "is_bigint___is_bigint_1.0.1.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; + sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + } + { + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + path = fetchurl { + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + } + { + name = "is_buffer___is_buffer_2.0.5.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; + }; + } + { + name = "is_callable___is_callable_1.2.3.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + }; + } + { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + path = fetchurl { + name = "is_color_stop___is_color_stop_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; + sha1 = "z/9HGu5N1cnhWFmPvhKWe1za00U="; + }; + } + { + name = "is_core_module___is_core_module_2.2.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + }; + } + { + name = "is_date_object___is_date_object_1.0.4.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; + sha512 = "/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="; + }; + } + { + name = "is_docker___is_docker_2.2.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + }; + } + { + name = "is_finite___is_finite_1.1.0.tgz"; + path = fetchurl { + name = "is_finite___is_finite_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz"; + sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + } + { + name = "is_generator_function___is_generator_function_1.0.9.tgz"; + path = fetchurl { + name = "is_generator_function___is_generator_function_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.9.tgz"; + sha512 = "ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A=="; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + } + { + name = "is_in_browser___is_in_browser_1.1.3.tgz"; + path = fetchurl { + name = "is_in_browser___is_in_browser_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz"; + sha1 = "Vv9NtoOgeMYILrldrX3GLh0E+DU="; + }; + } + { + name = "is_jpg___is_jpg_2.0.0.tgz"; + path = fetchurl { + name = "is_jpg___is_jpg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz"; + sha1 = "LhmX+m6RZuqsAkLarkQ0A+TvHZc="; + }; + } + { + name = "is_lambda___is_lambda_1.0.1.tgz"; + path = fetchurl { + name = "is_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha1 = "PZh3iZ5qU+/AFgUEzeFfgubwYdU="; + }; + } + { + name = "is_natural_number___is_natural_number_4.0.1.tgz"; + path = fetchurl { + name = "is_natural_number___is_natural_number_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "q5124dtM7VHjXeDHLr7PCfc0zeg="; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + }; + } + { + name = "is_number_object___is_number_object_1.0.5.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + } + { + name = "is_object___is_object_1.0.2.tgz"; + path = fetchurl { + name = "is_object___is_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz"; + sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + } + { + name = "is_png___is_png_2.0.0.tgz"; + path = fetchurl { + name = "is_png___is_png_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz"; + sha512 = "4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g=="; + }; + } + { + name = "is_regex___is_regex_1.1.3.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ=="; + }; + } + { + name = "is_relative___is_relative_1.0.0.tgz"; + path = fetchurl { + name = "is_relative___is_relative_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; + }; + } + { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + path = fetchurl { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; + }; + } + { + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + path = fetchurl { + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; + }; + } + { + name = "is_stream___is_stream_2.0.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + } + { + name = "is_string___is_string_1.0.6.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="; + }; + } + { + name = "is_subset___is_subset_0.1.1.tgz"; + path = fetchurl { + name = "is_subset___is_subset_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "ilkRfZMt4d4A8kX83TnOQ/HpOaY="; + }; + } + { + name = "is_svg___is_svg_4.3.1.tgz"; + path = fetchurl { + name = "is_svg___is_svg_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz"; + sha512 = "h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA=="; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + } + { + name = "is_typed_array___is_typed_array_1.1.5.tgz"; + path = fetchurl { + name = "is_typed_array___is_typed_array_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz"; + sha512 = "S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug=="; + }; + } + { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + path = fetchurl { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; + }; + } + { + name = "istanbul_instrumenter_loader___istanbul_instrumenter_loader_3.0.1.tgz"; + path = fetchurl { + name = "istanbul_instrumenter_loader___istanbul_instrumenter_loader_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz"; + sha512 = "a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w=="; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_1.2.1.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz"; + sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; + sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_1.10.2.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz"; + sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A=="; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; + sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; + sha512 = "c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg=="; + }; + } + { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; + sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; + }; + } + { + name = "isurl___isurl_1.0.0.tgz"; + path = fetchurl { + name = "isurl___isurl_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz"; + sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; + }; + } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + }; + } + { + name = "jasmine_core___jasmine_core_3.7.1.tgz"; + path = fetchurl { + name = "jasmine_core___jasmine_core_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz"; + sha512 = "DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ=="; + }; + } + { + name = "jasmine_enzyme___jasmine_enzyme_7.1.2.tgz"; + path = fetchurl { + name = "jasmine_enzyme___jasmine_enzyme_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/jasmine-enzyme/-/jasmine-enzyme-7.1.2.tgz"; + sha512 = "4C9GeKgcJerRWBOt3nu9MAjjm5DK8kRbCBKLNWvDjbSfLWodomfjZA2lIpRcJkmof9tIfff2ZWa7DD53WLhyGA=="; + }; + } + { + name = "javascript_natural_sort___javascript_natural_sort_0.7.1.tgz"; + path = fetchurl { + name = "javascript_natural_sort___javascript_natural_sort_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; + sha1 = "+eIwPUUH9tdDVac2ZNFED7Wg71k="; + }; + } + { + name = "jest_worker___jest_worker_26.6.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; + }; + } + { + name = "jmespath___jmespath_0.15.0.tgz"; + path = fetchurl { + name = "jmespath___jmespath_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "o/Iiqarp+Wb10nx5ZRDigJF2Qhc="; + }; + } + { + name = "jquery_contextmenu___jquery_contextmenu_2.9.2.tgz"; + path = fetchurl { + name = "jquery_contextmenu___jquery_contextmenu_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz"; + sha512 = "6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw=="; + }; + } + { + name = "jquery_ui___jquery_ui_1.13.0.tgz"; + path = fetchurl { + name = "jquery_ui___jquery_ui_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; + sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; + }; + } + { + name = "jquery___jquery_3.6.0.tgz"; + path = fetchurl { + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; + }; + } + { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + path = fetchurl { + name = "js_string_escape___js_string_escape_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz"; + sha1 = "4mJbrbwNZ8dTPp7cEGjFh65BN+8="; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + } + { + name = "js_tokens___js_tokens_3.0.2.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "mGbfOVECEw449/mWvOtlRDIJwls="; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; + }; + } + { + name = "jsbn___jsbn_1.1.0.tgz"; + path = fetchurl { + name = "jsbn___jsbn_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz"; + sha1 = "sBMHyym2GKHtJux56RH4A8TaAEA="; + }; + } + { + name = "jsesc___jsesc_1.3.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "RsP+yMGJKxKwgz25vHYiF226s0s="; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; + }; + } + { + name = "json_bignumber___json_bignumber_1.0.2.tgz"; + path = fetchurl { + name = "json_bignumber___json_bignumber_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-bignumber/-/json-bignumber-1.0.2.tgz"; + sha512 = "CfvvCybXLMo3+ZW4gkSOM1OF+f6rWTeZ5AZvYHcmcEPzK0z4EDR9XrdQoARGoozw3+qdS4DLe+Q/et4NstxrNA=="; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A="; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + } + { + name = "json_source_map___json_source_map_0.6.1.tgz"; + path = fetchurl { + name = "json_source_map___json_source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/json-source-map/-/json-source-map-0.6.1.tgz"; + sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + }; + } + { + name = "jsoneditor___jsoneditor_9.5.6.tgz"; + path = fetchurl { + name = "jsoneditor___jsoneditor_9.5.6.tgz"; + url = "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.5.6.tgz"; + sha512 = "smu4CKCOeJiizGGGYQ7ZAvCclnuJP7gX/wcoHw/DWiJMUZq+3KjJNDhYnVTRgi+Zk0UlPngA4egmuJre/H2mXg=="; + }; + } + { + name = "jsonfile___jsonfile_6.1.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "vFWyY0eTxnnsZAMJTrE2mKbsCq4="; + }; + } + { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "P02uSpH6wxX3EGL4UhzCOfE2YoA="; + }; + } + { + name = "jsonrepair___jsonrepair_2.2.1.tgz"; + path = fetchurl { + name = "jsonrepair___jsonrepair_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/jsonrepair/-/jsonrepair-2.2.1.tgz"; + sha512 = "o9Je8TceILo872uQC9fIBJm957j1Io7z8Ca1iWIqY6S5S65HGE9XN7XEEw7+tUviB9Vq4sygV89MVTxl+rhZyg=="; + }; + } + { + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.5.1.tgz"; + sha512 = "9+oymA7wPtswm+zxVti1qiowC5q7bRdCJNORtns2JUj/QHp2QPXYwSNRD8+D2Cy3/CEMtdJzlNnt5aXmpS6NAg=="; + }; + } + { + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.5.1.tgz"; + sha512 = "D48hJBc9Tj3PusvlillHW8Fz0y/QqA7MNmTYDQaSB/7mTrCZjt7AVRROExoOHEtd2qIYKOYJW3Jc2agnvsXRlQ=="; + }; + } + { + name = "jss_plugin_global___jss_plugin_global_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_global___jss_plugin_global_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.5.1.tgz"; + sha512 = "jX4XpNgoaB8yPWw/gA1aPXJEoX0LNpvsROPvxlnYe+SE0JOhuvF7mA6dCkgpXBxfTWKJsno7cDSCgzHTocRjCQ=="; + }; + } + { + name = "jss_plugin_nested___jss_plugin_nested_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_nested___jss_plugin_nested_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.5.1.tgz"; + sha512 = "xXkWKOCljuwHNjSYcXrCxBnjd8eJp90KVFW1rlhvKKRXnEKVD6vdKXYezk2a89uKAHckSvBvBoDGsfZrldWqqQ=="; + }; + } + { + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.5.1.tgz"; + sha512 = "t+2vcevNmMg4U/jAuxlfjKt46D/jHzCPEjsjLRj/J56CvP7Iy03scsUP58Iw8mVnaV36xAUZH2CmAmAdo8994g=="; + }; + } + { + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.5.1.tgz"; + sha512 = "3gjrSxsy4ka/lGQsTDY8oYYtkt2esBvQiceGBB4PykXxHoGRz14tbCK31Zc6DHEnIeqsjMUGbq+wEly5UViStQ=="; + }; + } + { + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.5.1.tgz"; + path = fetchurl { + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.5.1.tgz"; + sha512 = "cLkH6RaPZWHa1TqSfd2vszNNgxT1W0omlSjAd6hCFHp3KIocSrW21gaHjlMU26JpTHwkc+tJTCQOmE/O1A4FKQ=="; + }; + } + { + name = "jss___jss_10.5.1.tgz"; + path = fetchurl { + name = "jss___jss_10.5.1.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.5.1.tgz"; + sha512 = "hbbO3+FOTqVdd7ZUoTiwpHzKXIo5vGpMNbuXH1a0wubRSWLWSBvwvaq4CiHH/U42CmjOnp6lVNNs/l+Z7ZdDmg=="; + }; + } + { + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; + sha512 = "EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q=="; + }; + } + { + name = "junk___junk_3.1.0.tgz"; + path = fetchurl { + name = "junk___junk_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz"; + sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; + }; + } + { + name = "karma_babel_preprocessor___karma_babel_preprocessor_8.0.1.tgz"; + path = fetchurl { + name = "karma_babel_preprocessor___karma_babel_preprocessor_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.1.tgz"; + sha512 = "5upyawNi3c7Gg6tPH1FWRVTmUijGf3v1GV4ScLM/2jKdDP18SlaKlUpu8eJrRI3STO8qK1bkqFcdgAA364nLYQ=="; + }; + } + { + name = "karma_browserify___karma_browserify_8.1.0.tgz"; + path = fetchurl { + name = "karma_browserify___karma_browserify_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-8.1.0.tgz"; + sha512 = "q5OWuCfdXMfyhkRrH8XP5LiixD4lx0uCmlf6yQmGeQNHLH4Hoofur3tBJtSEhOXmY0mOdBe8ek2UUxicjmGqFQ=="; + }; + } + { + name = "karma_chrome_launcher___karma_chrome_launcher_3.1.0.tgz"; + path = fetchurl { + name = "karma_chrome_launcher___karma_chrome_launcher_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz"; + sha512 = "3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg=="; + }; + } + { + name = "karma_coverage___karma_coverage_2.0.3.tgz"; + path = fetchurl { + name = "karma_coverage___karma_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-2.0.3.tgz"; + sha512 = "atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g=="; + }; + } + { + name = "karma_jasmine_html_reporter___karma_jasmine_html_reporter_1.6.0.tgz"; + path = fetchurl { + name = "karma_jasmine_html_reporter___karma_jasmine_html_reporter_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz"; + sha512 = "ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw=="; + }; + } + { + name = "karma_jasmine___karma_jasmine_4.0.1.tgz"; + path = fetchurl { + name = "karma_jasmine___karma_jasmine_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz"; + sha512 = "h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw=="; + }; + } + { + name = "karma_requirejs___karma_requirejs_1.1.0.tgz"; + path = fetchurl { + name = "karma_requirejs___karma_requirejs_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz"; + sha1 = "/driy4fX68FvsCIok1ZNf+5Xh5g="; + }; + } + { + name = "karma_source_map_support___karma_source_map_support_1.4.0.tgz"; + path = fetchurl { + name = "karma_source_map_support___karma_source_map_support_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz"; + sha512 = "RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A=="; + }; + } + { + name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.8.tgz"; + path = fetchurl { + name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz"; + sha512 = "zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g=="; + }; + } + { + name = "karma_webpack___karma_webpack_5.0.0.tgz"; + path = fetchurl { + name = "karma_webpack___karma_webpack_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz"; + sha512 = "+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA=="; + }; + } + { + name = "karma___karma_6.3.2.tgz"; + path = fetchurl { + name = "karma___karma_6.3.2.tgz"; + url = "https://registry.yarnpkg.com/karma/-/karma-6.3.2.tgz"; + sha512 = "fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw=="; + }; + } + { + name = "keyv___keyv_3.0.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz"; + sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + } + { + name = "labeled_stream_splicer___labeled_stream_splicer_2.0.2.tgz"; + path = fetchurl { + name = "labeled_stream_splicer___labeled_stream_splicer_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz"; + sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; + }; + } + { + name = "leaflet___leaflet_1.7.1.tgz"; + path = fetchurl { + name = "leaflet___leaflet_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz"; + sha512 = "/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; + }; + } + { + name = "loader_runner___loader_runner_4.2.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz"; + sha512 = "92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="; + }; + } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + } + { + name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; + path = fetchurl { + name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz"; + sha1 = "2AJfdjOdKTQnZ9zIh85cuVpbUfE="; + }; + } + { + name = "lodash._bindcallback___lodash._bindcallback_3.0.1.tgz"; + path = fetchurl { + name = "lodash._bindcallback___lodash._bindcallback_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; + sha1 = "5THCdkTPi1epnhftlbNcdIeJOS4="; + }; + } + { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + path = fetchurl { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "VwvH3t5G1hzc3mh9ZdPuy6o6r/U="; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "4j8/nE+Pvd6HJSnBBxhXoIblzO8="; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; + }; + } + { + name = "lodash.escape___lodash.escape_4.0.1.tgz"; + path = fetchurl { + name = "lodash.escape___lodash.escape_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz"; + sha1 = "yQRGkMIeBClL6qUXcS/e0fqI3pg="; + }; + } + { + name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "+wMJF/hqMTTlvJvsDWngAT3f7bI="; + }; + } + { + name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; + path = fetchurl { + name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "L1c9hcaiQon/AGY7SRwdM4/zRYo="; + }; + } + { + name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; + path = fetchurl { + name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; + sha1 = "eeTriMNqgSKvhvhEqpvNhRtfu1U="; + }; + } + { + name = "lodash.isequal___lodash.isequal_3.0.4.tgz"; + path = fetchurl { + name = "lodash.isequal___lodash.isequal_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz"; + sha1 = "HDXrO27wzR/1F0Pj6jz3/f/ay2Q="; + }; + } + { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + path = fetchurl { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "QVxEePK8wwEgwizhDtMib30+GOA="; + }; + } + { + name = "lodash.istypedarray___lodash.istypedarray_3.0.6.tgz"; + path = fetchurl { + name = "lodash.istypedarray___lodash.istypedarray_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"; + sha1 = "yaR3SYYHUB2OhJTSg7h8OSgc72I="; + }; + } + { + name = "lodash.keys___lodash.keys_3.1.2.tgz"; + path = fetchurl { + name = "lodash.keys___lodash.keys_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz"; + sha1 = "TbwEcrFWvlCgsoaFXRvQsMZWCYo="; + }; + } + { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; + }; + } + { + name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "LcvSwofLwKVcxCMovQxzYVDVPj8="; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "0CJTc662Uq3BvILklFM5qEJ1R3M="; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + } + { + name = "log4js___log4js_6.4.1.tgz"; + path = fetchurl { + name = "log4js___log4js_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz"; + sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg=="; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "TjNms55/VFfjXxMkvfb4jQv8cwY="; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + } + { + name = "lunr___lunr_0.7.2.tgz"; + path = fetchurl { + name = "lunr___lunr_0.7.2.tgz"; + url = "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz"; + sha1 = "eaMOky4hbLoWNUHuN6NgfBLNcoE="; + }; + } + { + name = "make_dir___make_dir_1.3.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + }; + } + { + name = "marked___marked_2.0.1.tgz"; + path = fetchurl { + name = "marked___marked_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-2.0.1.tgz"; + sha512 = "5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw=="; + }; + } + { + name = "matches_selector___matches_selector_0.0.1.tgz"; + path = fetchurl { + name = "matches_selector___matches_selector_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz"; + sha1 = "HfUmIkOuNBwaCATdMCBIJnrHE7s="; + }; + } + { + name = "md5.js___md5.js_1.3.5.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + } + { + name = "mdn_data___mdn_data_2.0.14.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.14.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; + sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; + }; + } + { + name = "mdn_data___mdn_data_2.0.4.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; + }; + } + { + name = "memoize_one___memoize_one_5.2.1.tgz"; + path = fetchurl { + name = "memoize_one___memoize_one_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz"; + sha512 = "zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + } + { + name = "microbuffer___microbuffer_1.0.0.tgz"; + path = fetchurl { + name = "microbuffer___microbuffer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz"; + sha1 = "izgy7UDIfVH0e7I0kTppinVtGdI="; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + }; + } + { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + }; + } + { + name = "mime_db___mime_db_1.46.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.46.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz"; + sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; + }; + } + { + name = "mime_types___mime_types_2.1.29.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.29.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz"; + sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; + }; + } + { + name = "mime___mime_2.5.2.tgz"; + path = fetchurl { + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.9.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.9.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.9.tgz"; + sha512 = "Ac4s+xhVbqlyhXS5J/Vh/QXUz3ycXlCqoCPpg0vdfhsIBH9eg/It/9L1r1XhSCH737M1lqcWnMuWL13zcygn5A=="; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + } + { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + } + { + name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; + path = fetchurl { + name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + } + { + name = "minipass___minipass_3.1.5.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + } + { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + path = fetchurl { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + } + { + name = "ml_array_max___ml_array_max_1.2.3.tgz"; + path = fetchurl { + name = "ml_array_max___ml_array_max_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/ml-array-max/-/ml-array-max-1.2.3.tgz"; + sha512 = "49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA=="; + }; + } + { + name = "ml_array_min___ml_array_min_1.2.2.tgz"; + path = fetchurl { + name = "ml_array_min___ml_array_min_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/ml-array-min/-/ml-array-min-1.2.2.tgz"; + sha512 = "yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ=="; + }; + } + { + name = "ml_array_rescale___ml_array_rescale_1.3.5.tgz"; + path = fetchurl { + name = "ml_array_rescale___ml_array_rescale_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz"; + sha512 = "czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA=="; + }; + } + { + name = "ml_matrix___ml_matrix_6.8.0.tgz"; + path = fetchurl { + name = "ml_matrix___ml_matrix_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.8.0.tgz"; + sha512 = "c29k/gtyzLeNs0vLB2u4hHYcKr8PdyIs4oB0OsVhlgKiHbYyFkC2e98FcUPKhcnzn234jeZk42No+6d4bXBDNg=="; + }; + } + { + name = "mobius1_selectr___mobius1_selectr_2.4.13.tgz"; + path = fetchurl { + name = "mobius1_selectr___mobius1_selectr_2.4.13.tgz"; + url = "https://registry.yarnpkg.com/mobius1-selectr/-/mobius1-selectr-2.4.13.tgz"; + sha512 = "Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="; + }; + } + { + name = "module_deps___module_deps_6.2.3.tgz"; + path = fetchurl { + name = "module_deps___module_deps_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.3.tgz"; + sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; + }; + } + { + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + path = fetchurl { + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; + }; + } + { + name = "moment___moment_2.29.1.tgz"; + path = fetchurl { + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + }; + } + { + name = "moment___moment_2.24.0.tgz"; + path = fetchurl { + name = "moment___moment_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + }; + } + { + name = "moo___moo_0.5.1.tgz"; + path = fetchurl { + name = "moo___moo_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz"; + sha512 = "I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="; + }; + } + { + name = "mousetrap___mousetrap_1.6.5.tgz"; + path = fetchurl { + name = "mousetrap___mousetrap_1.6.5.tgz"; + url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; + sha512 = "QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="; + }; + } + { + name = "mozjpeg___mozjpeg_7.1.1.tgz"; + path = fetchurl { + name = "mozjpeg___mozjpeg_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-7.1.1.tgz"; + sha512 = "iIDxWvzhWvLC9mcRJ1uSkiKaj4drF58oCqK2bITm5c2Jt6cJ8qQjSSru2PCaysG+hLIinryj8mgz5ZJzOYTv1A=="; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "nan___nan_2.15.0.tgz"; + path = fetchurl { + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + }; + } + { + name = "nanocolors___nanocolors_0.1.12.tgz"; + path = fetchurl { + name = "nanocolors___nanocolors_0.1.12.tgz"; + url = "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz"; + sha512 = "2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="; + }; + } + { + name = "nanoid___nanoid_3.2.0.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; + sha1 = "YmZ1Itpmc5ccypFqbT7/P0Ff+Aw="; + }; + } + { + name = "nanopop___nanopop_2.1.0.tgz"; + path = fetchurl { + name = "nanopop___nanopop_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/nanopop/-/nanopop-2.1.0.tgz"; + sha512 = "jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw=="; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + }; + } + { + name = "nearley___nearley_2.20.1.tgz"; + path = fetchurl { + name = "nearley___nearley_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz"; + sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; + }; + } + { + name = "neatequal___neatequal_1.0.0.tgz"; + path = fetchurl { + name = "neatequal___neatequal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz"; + sha1 = "LuEhG8n6bkxVcV/SELsFYC6xrjs="; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + } + { + name = "node_gyp___node_gyp_8.3.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.3.0.tgz"; + sha512 = "e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA=="; + }; + } + { + name = "node_releases___node_releases_1.1.72.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.72.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; + sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; + }; + } + { + name = "nopt___nopt_5.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + } + { + name = "normalize_range___normalize_range_0.1.2.tgz"; + path = fetchurl { + name = "normalize_range___normalize_range_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "LRDAa9/TEuqXd2laTShDlFa3WUI="; + }; + } + { + name = "normalize_url___normalize_url_2.0.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; + }; + } + { + name = "normalize_url___normalize_url_4.5.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + } + { + name = "notificar___notificar_1.0.1.tgz"; + path = fetchurl { + name = "notificar___notificar_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/notificar/-/notificar-1.0.1.tgz"; + sha512 = "jiCay0IY0N+gloyDks+v4WV+OKU4lIXUhQgxw4Iu9bXpw80cNXTezVv46OCK5+E8G8fkt1Bj76DNepULqlQS3Q=="; + }; + } + { + name = "notistack___notistack_1.0.10.tgz"; + path = fetchurl { + name = "notistack___notistack_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/notistack/-/notistack-1.0.10.tgz"; + sha512 = "z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ=="; + }; + } + { + name = "npm_conf___npm_conf_1.1.3.tgz"; + path = fetchurl { + name = "npm_conf___npm_conf_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + name = "nth_check___nth_check_1.0.2.tgz"; + path = fetchurl { + name = "nth_check___nth_check_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + } + { + name = "nth_check___nth_check_2.0.1.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz"; + sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; + }; + } + { + name = "object_inspect___object_inspect_1.10.3.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; + sha512 = "e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="; + }; + } + { + name = "object_is___object_is_1.1.5.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + } + { + name = "object.entries___object.entries_1.1.4.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz"; + sha512 = "h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA=="; + }; + } + { + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + path = fetchurl { + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; + sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ=="; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="; + }; + } + { + name = "object.values___object.values_1.1.4.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; + sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + } + { + name = "opener___opener_1.5.2.tgz"; + path = fetchurl { + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + } + { + name = "optipng_bin___optipng_bin_7.0.1.tgz"; + path = fetchurl { + name = "optipng_bin___optipng_bin_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-7.0.1.tgz"; + sha512 = "W99mpdW7Nt2PpFiaO+74pkht7KEqkXkeRomdWXfEz3SALZ6hns81y/pm1dsGZ6ItUIfchiNIP6ORDr1zETU1jA=="; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "hUNzx/XCMVkU/Jv8a9gjj92h7Cc="; + }; + } + { + name = "os_filter_obj___os_filter_obj_2.0.0.tgz"; + path = fetchurl { + name = "os_filter_obj___os_filter_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz"; + sha512 = "uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg=="; + }; + } + { + name = "os_shim___os_shim_0.1.3.tgz"; + path = fetchurl { + name = "os_shim___os_shim_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "a2LDeRz3kJ6jXtRuF2WLtBfLORc="; + }; + } + { + name = "ow___ow_0.17.0.tgz"; + path = fetchurl { + name = "ow___ow_0.17.0.tgz"; + url = "https://registry.yarnpkg.com/ow/-/ow-0.17.0.tgz"; + sha512 = "i3keDzDQP5lWIe4oODyDFey1qVrq2hXKTuTH2VpqwpYtzPiKZt2ziRI4NBQmgW40AnV5Euz17OyWweCb+bNEQA=="; + }; + } + { + name = "p_cancelable___p_cancelable_0.3.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha512 = "RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw=="; + }; + } + { + name = "p_cancelable___p_cancelable_0.4.1.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; + }; + } + { + name = "p_event___p_event_1.3.0.tgz"; + path = fetchurl { + name = "p_event___p_event_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz"; + sha1 = "jmtPT2XHK8W2/ii3XtqHT5akoIU="; + }; + } + { + name = "p_event___p_event_2.3.1.tgz"; + path = fetchurl { + name = "p_event___p_event_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz"; + sha512 = "NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA=="; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; + }; + } + { + name = "p_is_promise___p_is_promise_1.1.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "nJRWmJ6fZYgBewQ01WCXZ1w9oF4="; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + } + { + name = "p_map_series___p_map_series_1.0.0.tgz"; + path = fetchurl { + name = "p_map_series___p_map_series_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz"; + sha1 = "v5j+V1cFZYqeE1G++4WuTB8Hvco="; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + } + { + name = "p_pipe___p_pipe_3.1.0.tgz"; + path = fetchurl { + name = "p_pipe___p_pipe_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz"; + sha512 = "08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw=="; + }; + } + { + name = "p_reduce___p_reduce_1.0.0.tgz"; + path = fetchurl { + name = "p_reduce___p_reduce_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "GMKw3ZNqRpClKfgjH1ig/bakffo="; + }; + } + { + name = "p_series___p_series_1.1.0.tgz"; + path = fetchurl { + name = "p_series___p_series_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-series/-/p-series-1.1.0.tgz"; + sha512 = "356covArc9UCfj2twY/sxCJKGMzzO+pJJtucizsPC6aS1xKSTBc9PQrQhvFR3+7F+fa2KBKdJjdIcv6NEWDcIQ=="; + }; + } + { + name = "p_timeout___p_timeout_1.2.1.tgz"; + path = fetchurl { + name = "p_timeout___p_timeout_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz"; + sha1 = "XrOzU7f86Z8QGhA4iAuwVOu+o4Y="; + }; + } + { + name = "p_timeout___p_timeout_2.0.1.tgz"; + path = fetchurl { + name = "p_timeout___p_timeout_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + } + { + name = "pako___pako_1.0.11.tgz"; + path = fetchurl { + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + } + { + name = "parents___parents_1.0.1.tgz"; + path = fetchurl { + name = "parents___parents_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz"; + sha1 = "/t1NK/GTp3dF/nHjcdc8MwfZx1E="; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + } + { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + path = fetchurl { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; + }; + } + { + name = "parse5___parse5_6.0.1.tgz"; + path = fetchurl { + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; + }; + } + { + name = "parseqs___parseqs_0.0.6.tgz"; + path = fetchurl { + name = "parseqs___parseqs_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz"; + sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="; + }; + } + { + name = "parseuri___parseuri_0.0.6.tgz"; + path = fetchurl { + name = "parseuri___parseuri_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz"; + sha512 = "AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + } + { + name = "path_browserify___path_browserify_1.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + } + { + name = "path_fx___path_fx_2.1.1.tgz"; + path = fetchurl { + name = "path_fx___path_fx_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-fx/-/path-fx-2.1.1.tgz"; + sha512 = "YQeSXseFrHZtxesLJVK4AGv/J3bPmmb0mAMeUbf52b2MVwLlzTEY2NatLP8mUE7eR0F4EBOIRmrQjPPvHZI2+Q=="; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + } + { + name = "path_platform___path_platform_0.11.15.tgz"; + path = fetchurl { + name = "path_platform___path_platform_0.11.15.tgz"; + url = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "6GQhf3TDaFDwhSt43Hv31KVyG/I="; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + } + { + name = "pathfinding___pathfinding_0.4.18.tgz"; + path = fetchurl { + name = "pathfinding___pathfinding_0.4.18.tgz"; + url = "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz"; + sha1 = "qZkPb6IrfvGW5WUbBJFlQDoEX+g="; + }; + } + { + name = "paths_js___paths_js_0.4.11.tgz"; + path = fetchurl { + name = "paths_js___paths_js_0.4.11.tgz"; + url = "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.11.tgz"; + sha512 = "3mqcLomDBXOo7Fo+UlaenG6f71bk1ZezPQy2JCmYHy2W2k5VKpP+Jbin9H0bjXynelTbglCqdFhSEkeIkKTYUA=="; + }; + } + { + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; + }; + } + { + name = "pgadmin4-treeview"; + path = + let + repo = fetchgit { + url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; + rev = "bf7ac7be65898883e3e05c9733426152a1da6422"; + sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63"; + }; + in + runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + } + { + name = "picomodal___picomodal_3.0.0.tgz"; + path = fetchurl { + name = "picomodal___picomodal_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz"; + sha1 = "+s0w9PvzSoCcHgTqUl8ATzmcC4I="; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "7RQaasBDqEnqWISY59yosVMw6Qw="; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "ITXW36ejWMBprJsXh3YogihFD/o="; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "clVrgM+g1IqXToDnckjoDtT3+HA="; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + } + { + name = "pngquant_bin___pngquant_bin_6.0.1.tgz"; + path = fetchurl { + name = "pngquant_bin___pngquant_bin_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-6.0.1.tgz"; + sha512 = "Q3PUyolfktf+hYio6wsg3SanQzEU/v8aICg/WpzxXcuCMRb7H2Q81okfpcEztbMvw25ILjd3a87doj2N9kvbpQ=="; + }; + } + { + name = "popper.js___popper.js_1.16.1_lts.tgz"; + path = fetchurl { + name = "popper.js___popper.js_1.16.1_lts.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz"; + sha512 = "Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="; + }; + } + { + name = "popper.js___popper.js_1.16.1.tgz"; + path = fetchurl { + name = "popper.js___popper.js_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; + sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; + }; + } + { + name = "postcss_calc___postcss_calc_8.0.0.tgz"; + path = fetchurl { + name = "postcss_calc___postcss_calc_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz"; + sha512 = "5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g=="; + }; + } + { + name = "postcss_colormin___postcss_colormin_5.1.1.tgz"; + path = fetchurl { + name = "postcss_colormin___postcss_colormin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.1.1.tgz"; + sha512 = "SyTmqKKN6PyYNeeKEC0hqIP5CDuprO1hHurdW1aezDyfofDUOn7y7MaxcolbsW3oazPwFiGiY30XRiW1V4iZpA=="; + }; + } + { + name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; + path = fetchurl { + name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz"; + sha512 = "C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg=="; + }; + } + { + name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz"; + sha512 = "lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg=="; + }; + } + { + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz"; + sha512 = "svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA=="; + }; + } + { + name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz"; + sha512 = "vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw=="; + }; + } + { + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; + path = fetchurl { + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz"; + sha512 = "Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q=="; + }; + } + { + name = "postcss_loader___postcss_loader_5.1.0.tgz"; + path = fetchurl { + name = "postcss_loader___postcss_loader_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-5.1.0.tgz"; + sha512 = "tGgKZF6Ntn16zIWXt7yKV19L0rISaozHPCfdPt+aHOnTZrreeqVR6hCkFhZYfJ6KgpyIFRkKuW8ygHtUid4GlA=="; + }; + } + { + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; + path = fetchurl { + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz"; + sha512 = "BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw=="; + }; + } + { + name = "postcss_merge_rules___postcss_merge_rules_5.0.1.tgz"; + path = fetchurl { + name = "postcss_merge_rules___postcss_merge_rules_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.1.tgz"; + sha512 = "UR6R5Ph0c96QB9TMBH3ml8/kvPCThPHepdhRqAbvMRDRHQACPC8iM5NpfIC03+VRMZTGXy4L/BvFzcDFCgb+fA=="; + }; + } + { + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; + path = fetchurl { + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz"; + sha512 = "7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA=="; + }; + } + { + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.1.tgz"; + path = fetchurl { + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz"; + sha512 = "odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g=="; + }; + } + { + name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; + path = fetchurl { + name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz"; + sha512 = "4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw=="; + }; + } + { + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; + path = fetchurl { + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz"; + sha512 = "NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og=="; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + } + { + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz"; + sha512 = "6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg=="; + }; + } + { + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz"; + sha512 = "uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ=="; + }; + } + { + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz"; + sha512 = "rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg=="; + }; + } + { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz"; + sha512 = "syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w=="; + }; + } + { + name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz"; + sha512 = "Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA=="; + }; + } + { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz"; + sha512 = "cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q=="; + }; + } + { + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz"; + sha512 = "kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA=="; + }; + } + { + name = "postcss_normalize_url___postcss_normalize_url_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_url___postcss_normalize_url_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.1.tgz"; + sha512 = "hkbG0j58Z1M830/CJ73VsP7gvlG1yF+4y7Fd1w4tD2c7CaA2Psll+pQ6eQhth9y9EaqZSLzamff/D0MZBMbYSg=="; + }; + } + { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; + path = fetchurl { + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz"; + sha512 = "iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA=="; + }; + } + { + name = "postcss_ordered_values___postcss_ordered_values_5.0.1.tgz"; + path = fetchurl { + name = "postcss_ordered_values___postcss_ordered_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.1.tgz"; + sha512 = "6mkCF5BQ25HvEcDfrMHCLLFHlraBSlOXFnQMHYhSpDO/5jSR1k8LdEXOkv+7+uzW6o6tBYea1Km0wQSRkPJkwA=="; + }; + } + { + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; + path = fetchurl { + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz"; + sha512 = "zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw=="; + }; + } + { + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; + path = fetchurl { + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz"; + sha512 = "a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA=="; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; + }; + } + { + name = "postcss_svgo___postcss_svgo_5.0.1.tgz"; + path = fetchurl { + name = "postcss_svgo___postcss_svgo_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.1.tgz"; + sha512 = "cD7DFo6tF9i5eWvwtI4irKOHCpmASFS0xvZ5EQIgEdA1AWfM/XiHHY/iss0gcKHhkqwgYmuo2M0KhJLd5Us6mg=="; + }; + } + { + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; + path = fetchurl { + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz"; + sha512 = "gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w=="; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + }; + } + { + name = "postcss___postcss_8.2.15.tgz"; + path = fetchurl { + name = "postcss___postcss_8.2.15.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz"; + sha512 = "2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q=="; + }; + } + { + name = "precond___precond_0.2.3.tgz"; + path = fetchurl { + name = "precond___precond_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz"; + sha1 = "qpWRvKokkj8eD0hJ0kD0fvwQdaw="; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + } + { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "1PRWKwzjaW5BrFLQ4ALlemNdxtw="; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "czIwDoQBYb2j5podHZGn1LwW8YI="; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "mEcocL8igTL8vdhoEputEsPAKeM="; + }; + } + { + name = "promise_retry___promise_retry_2.0.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + } + { + name = "prop_types_exact___prop_types_exact_1.2.0.tgz"; + path = fetchurl { + name = "prop_types_exact___prop_types_exact_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz"; + sha512 = "K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA=="; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "8FKijacOYYkX7wqKw0wa5aaChrM="; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "llOgNvt8HuQjQvIyXM7v6jkmxI0="; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "wNWmOycYgArY4esPpSachN1BhF4="; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + } + { + name = "q___q_1.5.1.tgz"; + path = fetchurl { + name = "q___q_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; + sha1 = "fjL3W0E4EpHQRhHxvxQQmsAGUdc="; + }; + } + { + name = "qjobs___qjobs_1.2.0.tgz"; + path = fetchurl { + name = "qjobs___qjobs_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz"; + sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + } + { + name = "query_string___query_string_5.1.1.tgz"; + path = fetchurl { + name = "query_string___query_string_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz"; + sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; + }; + } + { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "nsYfeQSYdXB9aUFFlv2Qek1xHnM="; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "sgmEkgO7Jd+CDadW50cAWHhSFiA="; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + } + { + name = "raf___raf_3.4.1.tgz"; + path = fetchurl { + name = "raf___raf_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; + sha512 = "Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="; + }; + } + { + name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz"; + path = fetchurl { + name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; + sha1 = "635iZ1SN3t+4mcG5Dlc3RVnN234="; + }; + } + { + name = "randexp___randexp_0.4.6.tgz"; + path = fetchurl { + name = "randexp___randexp_0.4.6.tgz"; + url = "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz"; + sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + } + { + name = "react_aspen___react_aspen_1.1.1.tgz"; + path = fetchurl { + name = "react_aspen___react_aspen_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz"; + sha512 = "m+r+UIAw29PKgt+2on7zR/fCa7dnvLeM/x2HorGPa39xm4ELHY0PhN0oyE2mO95yqha7mqexD7RXd6iKfVKv7g=="; + }; + } + { + name = "react_checkbox_tree___react_checkbox_tree_1.7.2.tgz"; + path = fetchurl { + name = "react_checkbox_tree___react_checkbox_tree_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/react-checkbox-tree/-/react-checkbox-tree-1.7.2.tgz"; + sha512 = "T0Y3Us2ds5QppOgIM/cSbtdrEBcCGkiz03o2p4elTireAIw0i5k5xPoaTxbjWTFmzgXajUrJzQMlBujEQhOUsQ=="; + }; + } + { + name = "react_dom___react_dom_16.14.0.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; + sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; + }; + } + { + name = "react_dom___react_dom_17.0.2.tgz"; + path = fetchurl { + name = "react_dom___react_dom_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; + sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; + }; + } + { + name = "react_draggable___react_draggable_4.4.4.tgz"; + path = fetchurl { + name = "react_draggable___react_draggable_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz"; + sha512 = "6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA=="; + }; + } + { + name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; + path = fetchurl { + name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz"; + sha512 = "nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg=="; + }; + } + { + name = "react_is___react_is_17.0.2.tgz"; + path = fetchurl { + name = "react_is___react_is_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; + sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; + }; + } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; + }; + } + { + name = "react_property___react_property_1.0.1.tgz"; + path = fetchurl { + name = "react_property___react_property_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz"; + sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ=="; + }; + } + { + name = "react_select___react_select_4.3.1.tgz"; + path = fetchurl { + name = "react_select___react_select_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz"; + sha512 = "HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q=="; + }; + } + { + name = "react_shallow_renderer___react_shallow_renderer_16.14.1.tgz"; + path = fetchurl { + name = "react_shallow_renderer___react_shallow_renderer_16.14.1.tgz"; + url = "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz"; + sha512 = "rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg=="; + }; + } + { + name = "react_table___react_table_7.7.0.tgz"; + path = fetchurl { + name = "react_table___react_table_7.7.0.tgz"; + url = "https://registry.yarnpkg.com/react-table/-/react-table-7.7.0.tgz"; + sha512 = "jBlj70iBwOTvvImsU9t01LjFjy4sXEtclBovl3mTiqjz23Reu0DKnRza4zlLtOPACx6j2/7MrQIthIK1Wi+LIA=="; + }; + } + { + name = "react_test_renderer___react_test_renderer_17.0.2.tgz"; + path = fetchurl { + name = "react_test_renderer___react_test_renderer_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-17.0.2.tgz"; + sha512 = "yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ=="; + }; + } + { + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw=="; + }; + } + { + name = "react_virtualized_auto_sizer___react_virtualized_auto_sizer_1.0.6.tgz"; + path = fetchurl { + name = "react_virtualized_auto_sizer___react_virtualized_auto_sizer_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz"; + sha512 = "7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ=="; + }; + } + { + name = "react_window___react_window_1.8.6.tgz"; + path = fetchurl { + name = "react_window___react_window_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz"; + sha512 = "8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg=="; + }; + } + { + name = "react___react_16.14.0.tgz"; + path = fetchurl { + name = "react___react_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; + sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; + }; + } + { + name = "react___react_17.0.2.tgz"; + path = fetchurl { + name = "react___react_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; + sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; + }; + } + { + name = "read_only_stream___read_only_stream_2.0.0.tgz"; + path = fetchurl { + name = "read_only_stream___read_only_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "JyT9aoET1zdkrCiNQ4YnDB2/F/A="; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "fPTFTvZI44EwhMY23SB54WbAgdk="; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + }; + } + { + name = "rechoir___rechoir_0.7.0.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz"; + sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + }; + } + { + name = "reflect.ownkeys___reflect.ownkeys_0.2.0.tgz"; + path = fetchurl { + name = "reflect.ownkeys___reflect.ownkeys_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz"; + sha1 = "dJrO7H8/34tj+SegSAnpDFwLNGA="; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + }; + } + { + name = "regenerate___regenerate_1.4.2.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; + }; + } + { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; + }; + } + { + name = "regjsgen___regjsgen_0.5.2.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + }; + } + { + name = "regjsparser___regjsparser_0.6.9.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz"; + sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; + }; + } + { + name = "repeating___repeating_2.0.1.tgz"; + path = fetchurl { + name = "repeating___repeating_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; + sha1 = "UhTFOpJtNVJwdSf7q0FdvAjQbdo="; + }; + } + { + name = "replace_ext___replace_ext_1.0.1.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz"; + sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "kl0mAdOaxIXgkc8NpcbmlNw9yv8="; + }; + } + { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + path = fetchurl { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + } + { + name = "resolve___resolve_2.0.0_next.3.tgz"; + path = fetchurl { + name = "resolve___resolve_2.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "G0KmJmoh8HQh0bC1S33BZ7AcATs="; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + } + { + name = "rfdc___rfdc_1.3.0.tgz"; + path = fetchurl { + name = "rfdc___rfdc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz"; + sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; + }; + } + { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + path = fetchurl { + name = "rgb_regex___rgb_regex_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; + sha1 = "wODWiC3w4jviVKR16O3UGRX+rrE="; + }; + } + { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + path = fetchurl { + name = "rgba_regex___rgba_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; + sha1 = "QzdOLiyglosO8VI0YLfXMP8i7rM="; + }; + } + { + name = "rifm___rifm_0.7.0.tgz"; + path = fetchurl { + name = "rifm___rifm_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/rifm/-/rifm-0.7.0.tgz"; + sha512 = "DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ=="; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + } + { + name = "ripemd160___ripemd160_2.0.2.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + }; + } + { + name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz"; + path = fetchurl { + name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz"; + sha1 = "gbIw6i/MYGbInjRy3nlChdmwPZE="; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + } + { + name = "sass_loader___sass_loader_11.1.1.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.1.1.tgz"; + sha512 = "fOCp/zLmj1V1WHDZbUbPgrZhA7HKXHEqkslzB+05U5K9SbSbcmH91C7QLW31AsXikxUMaxXRhhcqWZAxUMLDyA=="; + }; + } + { + name = "sass_resources_loader___sass_resources_loader_2.2.1.tgz"; + path = fetchurl { + name = "sass_resources_loader___sass_resources_loader_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.1.tgz"; + sha512 = "WlofxbWOVnxad874IHZdWbP9eW1pbyqsTJKBsMbeB+YELvLSrZQNDTpH70s6F19BwtanR3NEFnyGwJ9WyotJTQ=="; + }; + } + { + name = "sass___sass_1.32.8.tgz"; + path = fetchurl { + name = "sass___sass_1.32.8.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz"; + sha512 = "Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ=="; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; + }; + } + { + name = "scheduler___scheduler_0.20.2.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; + sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; + }; + } + { + name = "schema_utils___schema_utils_0.3.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz"; + sha1 = "9YdyIs4+kx7a4DnxfrNxbnE3+M8="; + }; + } + { + name = "schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; + }; + } + { + name = "schema_utils___schema_utils_2.7.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; + }; + } + { + name = "schema_utils___schema_utils_3.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + }; + } + { + name = "seek_bzip___seek_bzip_1.0.6.tgz"; + path = fetchurl { + name = "seek_bzip___seek_bzip_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz"; + sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; + }; + } + { + name = "select2___select2_4.0.13.tgz"; + path = fetchurl { + name = "select2___select2_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz"; + sha512 = "1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="; + }; + } + { + name = "semver_regex___semver_regex_2.0.0.tgz"; + path = fetchurl { + name = "semver_regex___semver_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz"; + sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; + }; + } + { + name = "semver_truncate___semver_truncate_1.1.2.tgz"; + path = fetchurl { + name = "semver_truncate___semver_truncate_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz"; + sha1 = "V/Qd5pcHpicJp+AQS6IRcQnqR+g="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + } + { + name = "sha.js___sha.js_2.4.11.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.11.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + } + { + name = "shallowequal___shallowequal_1.1.0.tgz"; + path = fetchurl { + name = "shallowequal___shallowequal_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz"; + sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="; + }; + } + { + name = "shasum_object___shasum_object_1.0.0.tgz"; + path = fetchurl { + name = "shasum_object___shasum_object_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shasum-object/-/shasum-object-1.0.0.tgz"; + sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + } + { + name = "shell_quote___shell_quote_1.7.2.tgz"; + path = fetchurl { + name = "shell_quote___shell_quote_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz"; + sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; + }; + } + { + name = "shim_loader___shim_loader_1.0.1.tgz"; + path = fetchurl { + name = "shim_loader___shim_loader_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz"; + sha1 = "JYOm0qqTiJfCpBZYvO9z7IfTql4="; + }; + } + { + name = "side_channel___side_channel_1.0.4.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "sirv___sirv_1.0.12.tgz"; + path = fetchurl { + name = "sirv___sirv_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.12.tgz"; + sha512 = "+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg=="; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + } + { + name = "SlickGrid.git"; + path = + let + repo = fetchgit { + url = "https://github.com/6pac/SlickGrid.git"; + rev = "4f8c6f498d0b82391fdf382beb8ef114ed7408e7"; + sha256 = "1d8gha5h60dlgmv36nlrgn5502hq64a3nhdl0pyn8017y470qdry"; + }; + in + runCommand "SlickGrid.git" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + } + { + name = "snapsvg_cjs___snapsvg_cjs_0.0.6.tgz"; + path = fetchurl { + name = "snapsvg_cjs___snapsvg_cjs_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz"; + sha1 = "Oy9WryVz09Nkw+1b+IhXRfTS3eE="; + }; + } + { + name = "snapsvg___snapsvg_0.5.1.tgz"; + path = fetchurl { + name = "snapsvg___snapsvg_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "DK9Sx5GJopB0b8RGzF6GP2vd3+M="; + }; + } + { + name = "socket.io_adapter___socket.io_adapter_2.1.0.tgz"; + path = fetchurl { + name = "socket.io_adapter___socket.io_adapter_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; + sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; + }; + } + { + name = "socket.io_client___socket.io_client_4.1.2.tgz"; + path = fetchurl { + name = "socket.io_client___socket.io_client_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.1.2.tgz"; + sha512 = "RDpWJP4DQT1XeexmeDyDkm0vrFc0+bUsHDKiVGaNISJvJonhQQOMqV9Vwfg0ZpPJ27LCdan7iqTI92FRSOkFWQ=="; + }; + } + { + name = "socket.io_parser___socket.io_parser_4.0.4.tgz"; + path = fetchurl { + name = "socket.io_parser___socket.io_parser_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz"; + sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; + }; + } + { + name = "socket.io___socket.io_3.1.2.tgz"; + path = fetchurl { + name = "socket.io___socket.io_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz"; + sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; + sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; + }; + } + { + name = "socks___socks_2.6.1.tgz"; + path = fetchurl { + name = "socks___socks_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz"; + sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + }; + } + { + name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; + path = fetchurl { + name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + sha1 = "nLb09OnkgVWmqgZx7dM2/xR5oYg="; + }; + } + { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "RBttTTRnmPG05J6JIK37oOVD+a0="; + }; + } + { + name = "sort_keys___sort_keys_2.0.0.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "ZYU1WEhh7JfXMNbPQYIuH1ZoQSg="; + }; + } + { + name = "source_list_map___source_list_map_1.1.2.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz"; + sha1 = "mIkBnRAkzOVc3AaUmDN+9hhqEaE="; + }; + } + { + name = "source_list_map___source_list_map_2.0.1.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + } + { + name = "split.js___split.js_1.6.4.tgz"; + path = fetchurl { + name = "split.js___split.js_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/split.js/-/split.js-1.6.4.tgz"; + sha512 = "kYmQZprRJrF1IOjg/E+gdBEsKFv5kbgUE6RJVJZvrIzTOK/IHzKSqIeiJnWs7IP5D9TnpTQ2CbanuDuIWcyDUQ=="; + }; + } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; + }; + } + { + name = "ssri___ssri_8.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + }; + } + { + name = "stable___stable_0.1.8.tgz"; + path = fetchurl { + name = "stable___stable_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; + }; + } + { + name = "stream_browserify___stream_browserify_3.0.0.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + } + { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + path = fetchurl { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "+02KFCDqNidk4hrUeAOXvry0HL4="; + }; + } + { + name = "stream_http___stream_http_3.2.0.tgz"; + path = fetchurl { + name = "stream_http___stream_http_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz"; + sha512 = "Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A=="; + }; + } + { + name = "stream_splicer___stream_splicer_2.0.1.tgz"; + path = fetchurl { + name = "stream_splicer___stream_splicer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.1.tgz"; + sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; + }; + } + { + name = "streamroller___streamroller_3.0.2.tgz"; + path = fetchurl { + name = "streamroller___streamroller_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz"; + sha1 = "MEGNDu49bJPsiX+JLtCY46geaLc="; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "J5siXfHVgrH1TmWt3UNS4Y+qBxM="; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + }; + } + { + name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; + path = fetchurl { + name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz"; + sha1 = "jZeDM8C8klOPUPOD5IiPPlYZ1lM="; + }; + } + { + name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; + path = fetchurl { + name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; + sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz"; + sha512 = "Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q=="; + }; + } + { + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; + path = fetchurl { + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz"; + sha512 = "hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q=="; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + } + { + name = "strip_comments___strip_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_comments___strip_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; + sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; + }; + } + { + name = "strip_dirs___strip_dirs_2.1.0.tgz"; + path = fetchurl { + name = "strip_dirs___strip_dirs_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; + }; + } + { + name = "strip_outer___strip_outer_1.0.1.tgz"; + path = fetchurl { + name = "strip_outer___strip_outer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; + }; + } + { + name = "style_loader___style_loader_2.0.0.tgz"; + path = fetchurl { + name = "style_loader___style_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz"; + sha512 = "Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ=="; + }; + } + { + name = "style_to_js___style_to_js_1.1.0.tgz"; + path = fetchurl { + name = "style_to_js___style_to_js_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.0.tgz"; + sha512 = "1OqefPDxGrlMwcbfpsTVRyzwdhr4W0uxYQzeA2F1CBc8WG04udg2+ybRnvh3XYL4TdHQrCahLtax2jc8xaE6rA=="; + }; + } + { + name = "style_to_object___style_to_object_0.3.0.tgz"; + path = fetchurl { + name = "style_to_object___style_to_object_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz"; + sha512 = "CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA=="; + }; + } + { + name = "styled_components___styled_components_5.2.1.tgz"; + path = fetchurl { + name = "styled_components___styled_components_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz"; + sha512 = "sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ=="; + }; + } + { + name = "stylehacks___stylehacks_5.0.1.tgz"; + path = fetchurl { + name = "stylehacks___stylehacks_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz"; + sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA=="; + }; + } + { + name = "stylis___stylis_4.0.10.tgz"; + path = fetchurl { + name = "stylis___stylis_4.0.10.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz"; + sha512 = "m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="; + }; + } + { + name = "subarg___subarg_1.0.0.tgz"; + path = fetchurl { + name = "subarg___subarg_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; + sha1 = "9izxdYHplrSPyWVpn1TAauJouNI="; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc="; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + } + { + name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; + path = fetchurl { + name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; + sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; + }; + } + { + name = "svg2ttf___svg2ttf_5.2.0.tgz"; + path = fetchurl { + name = "svg2ttf___svg2ttf_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz"; + sha512 = "CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA=="; + }; + } + { + name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; + path = fetchurl { + name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz"; + sha512 = "mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ=="; + }; + } + { + name = "svgo_loader___svgo_loader_2.2.2.tgz"; + path = fetchurl { + name = "svgo_loader___svgo_loader_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/svgo-loader/-/svgo-loader-2.2.2.tgz"; + sha512 = "UeE/4yZEK96LoYqvxwh8YqCOJCjXwRY9K6YT99vXE+nYhs/W8hAY2hNf5zg/lRsyKshJkR79V+4beV3cbGL40Q=="; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + }; + } + { + name = "svgo___svgo_2.7.0.tgz"; + path = fetchurl { + name = "svgo___svgo_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz"; + sha512 = "aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w=="; + }; + } + { + name = "svgpath___svgpath_2.3.1.tgz"; + path = fetchurl { + name = "svgpath___svgpath_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz"; + sha512 = "wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg=="; + }; + } + { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + path = fetchurl { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; + }; + } + { + name = "syntax_error___syntax_error_1.4.0.tgz"; + path = fetchurl { + name = "syntax_error___syntax_error_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; + }; + } + { + name = "tablesorter___tablesorter_2.31.3.tgz"; + path = fetchurl { + name = "tablesorter___tablesorter_2.31.3.tgz"; + url = "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz"; + sha512 = "ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA=="; + }; + } + { + name = "tapable___tapable_2.2.0.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz"; + sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="; + }; + } + { + name = "tar_stream___tar_stream_1.6.2.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz"; + sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; + }; + } + { + name = "tar___tar_6.1.11.tgz"; + path = fetchurl { + name = "tar___tar_6.1.11.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + } + { + name = "temp_dir___temp_dir_1.0.0.tgz"; + path = fetchurl { + name = "temp_dir___temp_dir_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "CnwOom06Oa+n4OvqnB/AvE2qAR0="; + }; + } + { + name = "tempfile___tempfile_2.0.0.tgz"; + path = fetchurl { + name = "tempfile___tempfile_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz"; + sha1 = "awRGhWqbERTRhW/8vlCczLCXcmU="; + }; + } + { + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; + path = fetchurl { + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz"; + sha512 = "vYnkmQYQq4+A51WyRc/6e03eM0BHDoPaxd556K1pd4Nhr0eGeB3+Mi9b+3CDx4189fg3gQlrsKzgJiHPRwSX3Q=="; + }; + } + { + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; + path = fetchurl { + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz"; + sha512 = "7a4oBQw4cjz6C87BLRg3KHVvzpnPlnRTkuDZ7SwcJayQQ4QgOryX5u6wj0q07TXhgtMQLCntZO6nVhHIKPaeUw=="; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_5.1.2.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz"; + sha512 = "6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q=="; + }; + } + { + name = "terser___terser_5.7.0.tgz"; + path = fetchurl { + name = "terser___terser_5.7.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz"; + sha512 = "HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g=="; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; + }; + } + { + name = "timed_out___timed_out_4.0.1.tgz"; + path = fetchurl { + name = "timed_out___timed_out_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "8y6srFoXW+ol1/q1Zas+2HQe9W8="; + }; + } + { + name = "timers_browserify___timers_browserify_1.4.2.tgz"; + path = fetchurl { + name = "timers_browserify___timers_browserify_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "ycWLV1voQHN1y14kYtrO50NZ9B0="; + }; + } + { + name = "timsort___timsort_0.3.0.tgz"; + path = fetchurl { + name = "timsort___timsort_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; + sha1 = "QFQRqOfmM5/mTbmiNN4R3DHgK9Q="; + }; + } + { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + path = fetchurl { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; + }; + } + { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + path = fetchurl { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; + sha512 = "lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="; + }; + } + { + name = "tippy.js___tippy.js_6.3.1.tgz"; + path = fetchurl { + name = "tippy.js___tippy.js_6.3.1.tgz"; + url = "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.1.tgz"; + sha512 = "JnFncCq+rF1dTURupoJ4yPie5Cof978inW6/4S6kmWV7LL9YOSEVMifED3KdrVPEG+Z/TFH2CDNJcQEfaeuQww=="; + }; + } + { + name = "tmp___tmp_0.2.1.tgz"; + path = fetchurl { + name = "tmp___tmp_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + } + { + name = "to_buffer___to_buffer_1.1.1.tgz"; + path = fetchurl { + name = "to_buffer___to_buffer_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; + }; + } + { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "uDVx+k2MJbguIxsG46MFXeTKGkc="; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + } + { + name = "totalist___totalist_1.1.0.tgz"; + path = fetchurl { + name = "totalist___totalist_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz"; + sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; + }; + } + { + name = "trim_repeated___trim_repeated_1.0.0.tgz"; + path = fetchurl { + name = "trim_repeated___trim_repeated_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "42RqLqTokTEr9+rObPsFOAvAHCE="; + }; + } + { + name = "trim_right___trim_right_1.0.1.tgz"; + path = fetchurl { + name = "trim_right___trim_right_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM="; + }; + } + { + name = "tslib___tslib_2.2.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz"; + sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + }; + } + { + name = "ttf2eot___ttf2eot_2.0.0.tgz"; + path = fetchurl { + name = "ttf2eot___ttf2eot_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz"; + sha1 = "jmM3pYWr0WCKDISVirSDzmn2ZUs="; + }; + } + { + name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; + path = fetchurl { + name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz"; + sha512 = "pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g=="; + }; + } + { + name = "ttf2woff___ttf2woff_2.0.2.tgz"; + path = fetchurl { + name = "ttf2woff___ttf2woff_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz"; + sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; + }; + } + { + name = "tty_browserify___tty_browserify_0.0.1.tgz"; + path = fetchurl { + name = "tty_browserify___tty_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + } + { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + }; + } + { + name = "typescript___typescript_3.9.10.tgz"; + path = fetchurl { + name = "typescript___typescript_3.9.10.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz"; + sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; + }; + } + { + name = "ua_parser_js___ua_parser_js_0.7.24.tgz"; + path = fetchurl { + name = "ua_parser_js___ua_parser_js_0.7.24.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz"; + sha512 = "yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw=="; + }; + } + { + name = "uglify_js___uglify_js_3.14.2.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.14.2.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz"; + sha512 = "rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="; + }; + } + { + name = "umd___umd_3.0.3.tgz"; + path = fetchurl { + name = "umd___umd_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz"; + sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + }; + } + { + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + path = fetchurl { + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; + }; + } + { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + path = fetchurl { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "5z3T17DXxe2G+6xrCufYxqadUPo="; + }; + } + { + name = "undeclared_identifiers___undeclared_identifiers_1.1.3.tgz"; + path = fetchurl { + name = "undeclared_identifiers___undeclared_identifiers_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; + }; + } + { + name = "underscore___underscore_1.13.1.tgz"; + path = fetchurl { + name = "underscore___underscore_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz"; + sha512 = "hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + }; + } + { + name = "uniqs___uniqs_2.0.0.tgz"; + path = fetchurl { + name = "uniqs___uniqs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; + sha1 = "/+3ks2slKQaW5uFl1KWe25mOawI="; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + } + { + name = "universalify___universalify_2.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "daSYTv7cSwiXXFrrc/Uw0C3yVxc="; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; + }; + } + { + name = "unquote___unquote_1.1.1.tgz"; + path = fetchurl { + name = "unquote___unquote_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; + sha1 = "j97XMk7G6IoP+LkF58CYzcCG1UQ="; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + } + { + name = "url_join___url_join_4.0.1.tgz"; + path = fetchurl { + name = "url_join___url_join_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz"; + sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="; + }; + } + { + name = "url_loader___url_loader_1.1.2.tgz"; + path = fetchurl { + name = "url_loader___url_loader_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz"; + sha512 = "dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg=="; + }; + } + { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "evjzA2Rem9eaJy56FKxovAYJ2nM="; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; + }; + } + { + name = "url_to_options___url_to_options_1.0.1.tgz"; + path = fetchurl { + name = "url_to_options___url_to_options_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "FQWgOiiaSMvXpDTvuu7FBV9WM6k="; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + }; + } + { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "evsa/lCAUkZInj23/g7TeTNqwPk="; + }; + } + { + name = "util___util_0.12.3.tgz"; + path = fetchurl { + name = "util___util_0.12.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz"; + sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog=="; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + } + { + name = "valid_filename___valid_filename_2.0.1.tgz"; + path = fetchurl { + name = "valid_filename___valid_filename_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz"; + sha1 = "B2jW82Sx7TvfaPDRWr/7DZ1s7K8="; + }; + } + { + name = "vanilla_picker___vanilla_picker_2.11.2.tgz"; + path = fetchurl { + name = "vanilla_picker___vanilla_picker_2.11.2.tgz"; + url = "https://registry.yarnpkg.com/vanilla-picker/-/vanilla-picker-2.11.2.tgz"; + sha512 = "2cP7LlUnxHxwOf06ReUVtd2RFJMnJGaxN2s0p8wzBH3In5b00Le7fFZ9VrIoBE0svZkSq/BC/Pwq/k/9n+AA2g=="; + }; + } + { + name = "varstream___varstream_0.3.2.tgz"; + path = fetchurl { + name = "varstream___varstream_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz"; + sha1 = "GKxklHZfP/GjWtmkvgU77BiKXeE="; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; + }; + } + { + name = "vendors___vendors_1.0.4.tgz"; + path = fetchurl { + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; + }; + } + { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; + }; + } + { + name = "void_elements___void_elements_2.0.1.tgz"; + path = fetchurl { + name = "void_elements___void_elements_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "wGavtYK7HLQSjWDqkjkulNXp2+w="; + }; + } + { + name = "watchpack___watchpack_2.2.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; + sha512 = "up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA=="; + }; + } + { + name = "wcDocker"; + path = + let + repo = fetchgit { + url = "https://github.com/EnterpriseDB/wcDocker/"; + rev = "40d025e0d86ee3cf058a52e01d2042113f134cdd"; + sha256 = "0978f184lh2fkcxl6fjpn210vip8ci1plpdbsvd0ziz4b3zz8h45"; + }; + in + runCommand "wcDocker" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { + name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; + path = fetchurl { + name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz"; + sha512 = "vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg=="; + }; + } + { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; + path = fetchurl { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz"; + sha512 = "PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ=="; + }; + } + { + name = "webpack_cli___webpack_cli_4.7.0.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz"; + sha512 = "7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g=="; + }; + } + { + name = "webpack_merge___webpack_merge_4.2.2.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + } + { + name = "webpack_merge___webpack_merge_5.7.3.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz"; + sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; + }; + } + { + name = "webpack_sources___webpack_sources_0.2.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz"; + sha1 = "F8Yr+vE8cH+dAsR54Nzd6DgGl/s="; + }; + } + { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + } + { + name = "webpack_sources___webpack_sources_2.3.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz"; + sha512 = "WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ=="; + }; + } + { + name = "webpack___webpack_5.24.3.tgz"; + path = fetchurl { + name = "webpack___webpack_5.24.3.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.24.3.tgz"; + sha512 = "x7lrWZ7wlWAdyKdML6YPvfVZkhD1ICuIZGODE5SzKJjqI9A4SpqGTjGJTc6CwaHqn19gGaoOR3ONJ46nYsn9rw=="; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; + }; + } + { + name = "which_typed_array___which_typed_array_1.1.4.tgz"; + path = fetchurl { + name = "which_typed_array___which_typed_array_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz"; + sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + } + { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; + }; + } + { + name = "wkx___wkx_0.5.0.tgz"; + path = fetchurl { + name = "wkx___wkx_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz"; + sha512 = "Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg=="; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + } + { + name = "wordwrap___wordwrap_1.0.0.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "J1hIEIkUVqQXHI0CJkQa3pDLyus="; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + }; + } + { + name = "ws___ws_7.4.6.tgz"; + path = fetchurl { + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; + }; + } + { + name = "xmldom___xmldom_0.5.0.tgz"; + path = fetchurl { + name = "xmldom___xmldom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; + sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + } + { + name = "xterm_addon_fit___xterm_addon_fit_0.5.0.tgz"; + path = fetchurl { + name = "xterm_addon_fit___xterm_addon_fit_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz"; + sha512 = "DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ=="; + }; + } + { + name = "xterm_addon_search___xterm_addon_search_0.8.0.tgz"; + path = fetchurl { + name = "xterm_addon_search___xterm_addon_search_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz"; + sha512 = "MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA=="; + }; + } + { + name = "xterm_addon_web_links___xterm_addon_web_links_0.4.0.tgz"; + path = fetchurl { + name = "xterm_addon_web_links___xterm_addon_web_links_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz"; + sha512 = "xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg=="; + }; + } + { + name = "xterm___xterm_4.12.0.tgz"; + path = fetchurl { + name = "xterm___xterm_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/xterm/-/xterm-4.12.0.tgz"; + sha512 = "K5mF/p3txUV18mjiZFlElagoHFpqXrm5OYHeoymeXSu8GG/nMaOO/+NRcNCwfdjzAbdQ5VLF32hEHiWWKKm0bw=="; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "HBH5IY8HYImkfdUS+TxmmaaoHVI="; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + } + { + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.6.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.6.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz"; + sha512 = "AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA=="; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; + }; + } + { + name = "yarn_audit_html___yarn_audit_html_2.1.0.tgz"; + path = fetchurl { + name = "yarn_audit_html___yarn_audit_html_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-2.1.0.tgz"; + sha512 = "5mNqo8SBhf/7y1AsZYdOImS0anZkKNqJTdGFYwm/je273V83kAE0nYTAYyl5LTicsF09QiPwFlZVdQ/PbGfj6w=="; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; + }; + } + { + name = "yeast___yeast_0.1.2.tgz"; + path = fetchurl { + name = "yeast___yeast_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz"; + sha1 = "AI4G2AlDIMNy28L47XagymyKxBk="; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + } + ]; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 9bb3ef46d9..7491cff2ab 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,40 +1,64 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.22.1"; + version = "3.25.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-x64.tar.gz"; - sha256 = "0yxjlkvyxap4c7ny5x0ch0j4d5360qapb670f6im7vnaqhc00by0"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-x64.tar.gz"; + sha256 = "0p2cz6hg2xf28pj2w0avi6hz855llm9kg7v422cf0m1b94s4dsbi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-amd64.tar.gz"; - sha256 = "02k3ars9i8pfby3070rnnldfcb5hbh32kd5xnbmgd0202yg5y3pd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0qywihi3k8505qgpr1j5gmqzyalqrrmxxz1k48ipdank48dkxs8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-amd64.tar.gz"; - sha256 = "0c61m2q7944a29dkcqcv5fv9jn2bz8mdfhnd33z8qaybhw2804rd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-amd64.tar.gz"; + sha256 = "12vwwmvjsb9fwjkazvcblizdk5xx0l4499r0rg5lr97h5c1j28al"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-amd64.tar.gz"; - sha256 = "0k5bpg6lmhj3cxsg43dkyw9jlwyllwwdhml3brkyfgb307cypl9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-amd64.tar.gz"; + sha256 = "0nkz7mcsgv1lbq0gdfs6nix4bmsn4zspn9jgji10jlawrk5l1ps4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-amd64.tar.gz"; - sha256 = "161g5gsr64idz17ffixbjrm0gnbpvpsf440yr26ci4bzdk0s81gh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-amd64.tar.gz"; + sha256 = "0bcmj8z86dqchc9rgnvjy7q0k2pmmd1c155nm4ik1j87ccclia0p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-amd64.tar.gz"; + sha256 = "08dvkkf153zkpjr2fz6wdrk4rqzmpfhj8nsmly7crr7d3xjhwqsc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-amd64.tar.gz"; + sha256 = "1fm0qhbs0ih1rgr2r46fz9fc6vrl1iwk9fd9q5plra93fxjdjdc4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-amd64.tar.gz"; + sha256 = "06z4h7hpm17zil1vkghlndl4l6fhc6qlgvj95sxx4n1mxdpf7w5l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0m89na1gqrb41h1dg5j876g5hp0mfk4g7ij7i4md1szk9fp4820k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-amd64.tar.gz"; + sha256 = "1s9s6a5w18zj0y78ar49mbicz8hjmqmzmw2agnwqwk9zhj35jvz8"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-amd64.tar.gz"; + sha256 = "1l97awwfd5hyw1q8wjcdz81blybzqklv9wk9pv1319j0251ddzz3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-amd64.tar.gz"; sha256 = "0yfbiv6q2rfm27gwc4vsg2112m1vll5rkk1zwpg510dzvrnjqqn6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-linux-amd64.tar.gz"; - sha256 = "1pi98naks37cc0nsrjfrnsknskwzsfj5ia01nhaj44caxzvnd8mh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-linux-amd64.tar.gz"; + sha256 = "0q3mj48kddl1cb80s03x5vksx8xa006qlzfkarbc3sa2qqlgqiqr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-amd64.tar.gz"; - sha256 = "19y5gm5s7ps0cwdv8j7lnlx1r4c94qf6cdc28z725wpyyq1grc38"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-linux-amd64.tar.gz"; + sha256 = "1djm9dh1445yn7hnl3m1hm6cw9cj7m9syv08xjjclwc3dj9k7qw5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-amd64.tar.gz"; @@ -45,24 +69,32 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-amd64.tar.gz"; - sha256 = "074ihk1c3g580grbipy0acryjsmaz8n65siyc7yz4gcgcwqwb5mj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-amd64.tar.gz"; + sha256 = "08r3zks93jcpih6zxjmnpvqjsxvfkj3av5a2iwxb87snmsz0jixz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-amd64.tar.gz"; - sha256 = "0ffbsnpgr6wz9xj5yq6m55xj4mqji7hir6dylyjcpdkrxnigyiss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-amd64.tar.gz"; + sha256 = "0lhfxqd600rjbdw16jpj5fysdm324kangi85qpwrd6273aylyv09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-amd64.tar.gz"; - sha256 = "14kz4ywhwb0lcsf3nbr9c884x83jdlbxmcg3g9jaq7r739fawpi9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1lni4wzmdhjbchjjx9z5iqawv4x1bixl3s541h39cr4x3y36m66m"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-amd64.tar.gz"; + sha256 = "1zzrzsa07af7x4vwv7zgwkdrfmlhw30dcc7hqj92q4mn6valbn5q"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-amd64.tar.gz"; + sha256 = "0cnwgr358lbrw6ssz8s7m87yniy7q2zhd6pmjhl8x41j1cljwyfa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-amd64.tar.gz"; sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-amd64.tar.gz"; - sha256 = "02xgkwfsfkqv38cjyc62rlsldbdd5j801gmlh9pf3qjdjj5d1fl3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-amd64.tar.gz"; + sha256 = "1ngpaw5fdlv7hxjnns6ajzj8dqrj3gzkabr5h5hq5dws23x2c999"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz"; @@ -77,62 +109,114 @@ sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-linux-amd64.tar.gz"; - sha256 = "0xaa2gaqgx5lf1vfg0s8y0nr6ygjcy7dbksf0jszizn08ifgpy8h"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; - sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-amd64.tar.gz"; + sha256 = "111q7jxkjni1091m3kp9c2n1zqlkiy7lrfsrqk4bzpcf67krk9vj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-amd64.tar.gz"; sha256 = "05nfdwgfzi5f3hgj2g6dccaidqf9a9xzlv5vp3cd1rsxd159yk9j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; - sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-amd64.tar.gz"; + sha256 = "18f30j0lmf2mrzynrrm068irlm972hc43vkp0205vkb1gvzf872m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-linux-amd64.tar.gz"; - sha256 = "0b44kfvl01b5cmf9ii6zzcj28i1dd4dx4angdah3hghbsc5hypby"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-amd64.tar.gz"; + sha256 = "1l4njlk616ksw29vg5jg6cmn9n31iw8f0h65iwv8f5pbvw64m3n0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-amd64.tar.gz"; + sha256 = "1b558l11r8a8xj5h2rk1lf761a83jzcbip7zvdg17f7rbyfilw56"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-amd64.tar.gz"; + sha256 = "0k1l6qf85ffbi62r7xs9clgf1g8mch5afrrjagqqb7dwi8sh34xa"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-amd64.tar.gz"; + sha256 = "1y67dlrkhrp7x2n0bbx7d8in9h4kwjqjdj4jkdbk1i3mfd46wh0k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-amd64.tar.gz"; + sha256 = "0ayb1r9snjqgmczkvz4kjbswr0a98lmpapll4nws9q0rjj2w48y7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-amd64.tar.gz"; + sha256 = "08vfycws8gw92q43611dixnww4d80pqqjf6a3xh6zfpfn990vy97"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-amd64.tar.gz"; + sha256 = "1c7qgzhmd2ifbmfznklaiqsf5mv9wir0iacw58gwyjalkvzb4v4l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-amd64.tar.gz"; sha256 = "0hl5liyga4iz7j3wy3qicx43d4mijnqayrnmpa5rws29lambgrql"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-linux-amd64.tar.gz"; + sha256 = "12qdhdbighj76ab3wz965jhybxxq4f2rlwyk9m3w8w4f2aprp0cm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; + sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p"; + } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-x64.tar.gz"; - sha256 = "0b68pfrd83x02rs2saybxycpkirjciilp4a94ps3788y1plinyih"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-x64.tar.gz"; + sha256 = "0xfirm2pf765q1sx3h2by6s6d9gra95zq8cahljsj46dxm5gc7n9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "02s2lyd8rlz86rjraxk5g3g55qhih38kmvq0k2gwkdb2d11npf6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "0cpzgbzascmgnzjigmsjs618lv4xnyv1vl1hwab6laryp5832c4h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-amd64.tar.gz"; - sha256 = "1a26schi28ci0zbm85yx4hlhwlwx0j0kk6d6nk9x1zldc3qzhw4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "0wm7vvbm747iqzhd8lnpq5zirlkcwcka6c3j9x59c7iwq8a3cba5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-amd64.tar.gz"; - sha256 = "04sblbjnxvxhxvzvsgjm83p6qahswwb2mvlylfpgq74ay86l6hki"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-amd64.tar.gz"; + sha256 = "0xp45n9mhg2x9bsxr5i9nx94vwfzvamnc427hi3p2738h2h3vika"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0cri2vqvqh4aghs4j66ykw8f4vm2fg1106xkq4q269ilxdd5ia8l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-amd64.tar.gz"; + sha256 = "0vsjiy7sf5brdf1d83n9pb6kpfrphllfndq1f6pfsh7nq7s0xpil"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0kmy5hf869pp40x7jlzxx6ghl0k4bn6yhh94x82ndz9syin5q21z"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-amd64.tar.gz"; + sha256 = "1fggvxi0salfhi81z9pgchm6pqcw5wh0m5hwgws22clk75x3h4pg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-amd64.tar.gz"; + sha256 = "1w0iwjny4vxplfi6kkdvglgalwwl5krk9hgfaiw7f1q43nkqw0bd"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0fjynq1ilfv6njjyyadhpc9ks8izwif3nf8mnb7wfxchxn7gqbsi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-amd64.tar.gz"; + sha256 = "1k6pndyk6kh4db3cp92hj1vbglicx81yqxw1bis94d3cr95xr2pv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "0is1dfv0c65sgk2hy5zng9f2jfxkvlp1pjy4ljyic039pvi80137"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-amd64.tar.gz"; sha256 = "1kgk48k4898zxsnhfg6z949m3mgicdm2zfg8ba7z1lbidzc6g3sq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "16dllbbmih9dm728wq86cpq2gkbyhlmpiwyh3r20jzhclrx4mgcw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "16abnsllcf7ap6gvxr1b68cc7k476vhdbg8wrjabx9h9b81lwhbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "115lcaqkliaxqg27hb1j773299kgs44d3l7p2da9kzla3sk7dps0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "11wnk0ssqzfcvks5qvc2yi6iv9nxxxxqwmnjyavdzp5s5vvpi5zm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-amd64.tar.gz"; @@ -143,24 +227,32 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-amd64.tar.gz"; - sha256 = "046j20xl3ibfyqkcra242a5rpix14n4w3h9w9x618fbznk24bcxb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-amd64.tar.gz"; + sha256 = "1d9q2q9br44kkpr7swn2qfg4xvbfb2wixbigixg3vjwz9n0bm4p8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-amd64.tar.gz"; - sha256 = "100rqkz0g1w0fhvgvgys9r6a7bqphzizn28lg7pbbkrwjh7s0bxq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-amd64.tar.gz"; + sha256 = "1200pb1ix308r5m6514s1b97q567f902c1zc1sfprr1r9psz3x16"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-amd64.tar.gz"; - sha256 = "15aj3vpafrb6hfrmi46pf6z3wj4y84dljsfzrvd6b5v0svmlr90d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "0i49x5s7sw69y19qmsrbrwhmjv7g07qrs5a3l1l8bsqawif5r65z"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "0mqciml9rzzfpjy7wdqqak1yym2yzilnsjyrpm255q38z77f5nkr"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "1616fbs348r539kcmvwxlhzzgdszgb0j2wy7lamqvnm8xw4l53ii"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-amd64.tar.gz"; sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-amd64.tar.gz"; - sha256 = "1dpr4h35zby8say0kcvin5y5k4yryx06p3qcx16zrlsjaz6lj84k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-amd64.tar.gz"; + sha256 = "14ab1qsq22c8wyl7k7slxag9g44v3c63qjr8ip5qylbdsxsh7pp7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz"; @@ -175,62 +267,114 @@ sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-darwin-amd64.tar.gz"; - sha256 = "0fbc60l3v7mar0g16mbwgqckp9i4kckwlacv165kkwrkvj8nrbym"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; - sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-amd64.tar.gz"; + sha256 = "13qxwzfsy0hmvgazry0q3qna0jk7llharcvdwz302fj4ad98s71j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-amd64.tar.gz"; sha256 = "0q19sh7l1mjl40i5vdsrjfldncxnicalmlgv3yjkw5xpxkgr98z0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "11k6vbsr2lszipjvpnpspqvj8b0j330cfpmkr5ipws9b02aqpw1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1f2m3zdxbdn7gb0xb3f0rgj7h54nay1wyrn3bk2nzvrdv5c3bhcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-amd64.tar.gz"; + sha256 = "1cr31yz4nmabncnim6vk8wfqihqrmsjpqgm4gmk8rsn0a21r9iry"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "0dp4jvi3bbbggg7s9lmx8qqdh9nd7iff8r827s2f6js98yakhw9g"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-amd64.tar.gz"; + sha256 = "0nzcf84dbiw3chmnwb7d2nl82kkn1scrrjiid1ni75cgwk200m04"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-amd64.tar.gz"; + sha256 = "1xprdbxf8fza4zc2myf9mv3hl79hda0h34fz4yqfawg4spa0q128"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1jzirnaxy6y862khqf29i25r8qyrpac2kmacs9ny118l77xp33il"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-amd64.tar.gz"; + sha256 = "0rfl4hxl72n6d15klykhwzxiyscci9jyy20vprqqs5z5d825xal4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-amd64.tar.gz"; + sha256 = "00sq1v8wkjzxw96y3gal15lqdz2ncbwa7lix3b4izy7c6rd3qfa6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-amd64.tar.gz"; sha256 = "1wkyjxgrp3llvis3yjdnw65chscmxxcwigkr71i2crj28db8fhwx"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "154za5bvq1bgyzn5cfz3n0la1gy27lmjafgs42mgyy511jz4m60l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; + sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4"; + } ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-arm64.tar.gz"; - sha256 = "0551zp5n77jzh8k3jbqq75zj734faryxxdd2fvw881cxf95v39aj"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-arm64.tar.gz"; + sha256 = "16vm2kdc53kf6ljb62fx74sl2asj2hg9xnksz582w88xp0mhipw2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-arm64.tar.gz"; - sha256 = "0rlbcxympplq1gwikxalz3c686kpy2vrsc2phfnm45vvrkl22k8j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-arm64.tar.gz"; + sha256 = "19byg31lcnh7gk2xqf5601d0xj93p0b9svz6zxvv713d9ny36839"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-arm64.tar.gz"; - sha256 = "0639dl0hj2l33mc4vqbcyywpkfn30fikmiw10zjikcdg1jxzj4nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-arm64.tar.gz"; + sha256 = "00f38gmdk6yjbqlmfnjqlk7x9sn8c27svabivq93hr0dc8bv2hzy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-arm64.tar.gz"; - sha256 = "15lxfilkgh9ansy9n2yv693fms3x718lrxz0g2nxi32hz9hq0ysl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-arm64.tar.gz"; + sha256 = "13gwhfl11grpv0kqdk3hd1z4mdqxj9czl9cvzkfc7idipim2wi19"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-arm64.tar.gz"; - sha256 = "08wasnpm5j1rrpsgdlw2h2rx5m7fl4vrm2js5a1vsaxx35374a6h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-arm64.tar.gz"; + sha256 = "09475k0qqiwxzgb3xm70wx6w3gr8figrsb7iqbyficfar71mvbf7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-arm64.tar.gz"; + sha256 = "1w9mdg3jr5skdljxvm16qnssq94cnwpk24r76rbmh16wxb1l0z6x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-arm64.tar.gz"; + sha256 = "0pxfijmbgwl1srfqhny1wps3qhmjnmi3p5ixffza1a5phffnjzwd"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-arm64.tar.gz"; + sha256 = "17bjngcxjhh4m9zc8rbb2ixqq2dhr405y4xnsxhwyld8lnnrqm7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-linux-arm64.tar.gz"; + sha256 = "0a6bmiz6ys1h6n59mw3w7b2g8rhbnr0rb40rwidazvkni0s03yha"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-arm64.tar.gz"; + sha256 = "1q4hzzsxraw6f7z2dlqbrlrkambqixyj9bq3fk4napgv6hl77qnh"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-arm64.tar.gz"; + sha256 = "15acmblgl5xdwrm6ikq420h8g88rvqlj34jdrngc47rlimmdh3l6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-arm64.tar.gz"; sha256 = "1wwv6v9srzsdlcxv92kwv4drkx8w1h5xcvcwqqn6gi2mvsf3kj9n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-linux-arm64.tar.gz"; - sha256 = "1s77az1b965lca69gqmmx8zfh63rf8vm2bkbzgfkj320zwbfbgj2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-linux-arm64.tar.gz"; + sha256 = "1qia1myzcrjiq16sy4vd24wzqgww46wkdi9gq94j1g2ih75pc9k2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-linux-arm64.tar.gz"; - sha256 = "1hik4456fdln7hxiw02856v02v0m33zsyiad40c9wg4n772ybchy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-linux-arm64.tar.gz"; + sha256 = "0vn6kgdwd63c62kaq3b09m3yipg43yh12s0a9zhi48p4wplsgf9s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; @@ -241,24 +385,32 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-arm64.tar.gz"; - sha256 = "0r53qwf1w68bnqii20b44q1xlgxggsisnlr46463nxm0jb0wwyn9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-arm64.tar.gz"; + sha256 = "1dy76gsig4gyjg7xzkgb200dlhfvbq2i0zc0002c5vsykc4mji1d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-arm64.tar.gz"; - sha256 = "1zr9vcr6qiql90bysapmrlafl7xmlv49bgp197w4w2290i5q7f6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-arm64.tar.gz"; + sha256 = "02gzj3zww0hmdq42d8b65wc12md9r7mygwymcix0f9lwza9gf4l2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-arm64.tar.gz"; - sha256 = "06ii12cl7wsfs9pwjkwz01szacg686vfzc6i253l6xvmmiqp6q0j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-arm64.tar.gz"; + sha256 = "0p8lr9iw1h9ax90aivya513bw1dipm7yycqm5094wgx08r2yfvlm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-arm64.tar.gz"; + sha256 = "0z0ch08xqbyjmizwvgx9jysnp6g3kjjbwh11gbc6vgxacqcajgz3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-arm64.tar.gz"; + sha256 = "1v3pdsdpqzgbsg181g9w0rn3sw1xirljvgvkw0081i9hxvhwq9zq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-arm64.tar.gz"; sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-arm64.tar.gz"; - sha256 = "12lnh8hk02w1n28v6i46kxxpkzw1j9zp84ha5p6bnarza6g4wxnk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-arm64.tar.gz"; + sha256 = "1y3nzdnh6fil12r0040h6kyyf01dgxjghpp55z49hin3k6yclnq3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz"; @@ -273,59 +425,114 @@ sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-linux-arm64.tar.gz"; - sha256 = "1xh93187s86x4pjm4j9djh2mfqqxrmkal761fhj2bldkgki2rkq8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-arm64.tar.gz"; + sha256 = "0dh28hhg2lbvbgw2yadw0ig68z2pcg51h38v74yczblm24k97jvq"; } - # pulumi-resource-packet skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-linux-arm64.tar.gz"; sha256 = "0j2c23ii4dn9yhpw6nymij65gv82y1xp4gi8lgxxf41b1i9bpb2i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; - sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-arm64.tar.gz"; + sha256 = "11k721ri7q36ss3kjvw07ki3snv35li167az6f8zp8h7fdhsrcn7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-linux-arm64.tar.gz"; - sha256 = "15ambcwhrvv30ykkz9pizfrl4pri7iwvgs6s8f5416vgdj0k26fc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-arm64.tar.gz"; + sha256 = "1hdf0zwlrc5i3k0vkqc2x8zz0zvwc1idnnai58d4k7f5qr89hg6z"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0rr2cngqnibbz6d99xswjg7wybgd5xwm8fi6dkqwj51yyrz0izrz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-arm64.tar.gz"; + sha256 = "06gdrjnk5jdnzc3jvzxl7iwf6gyyp9bqk1jrljxpkzr0ck8yz01l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-arm64.tar.gz"; + sha256 = "1hih41dvdpxwh145kghp5xwpv5fn8r0wni8jh12qv5nl6apaa75p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-arm64.tar.gz"; + sha256 = "1275cikf75lnf3d4k4ld0by1r8hr6gq6mih09fsfg98b8f7n16kq"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-arm64.tar.gz"; + sha256 = "19iv4jp74j87p1hnqc205i9gl45c4jqc025lwgylgplfmmz9iagy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-arm64.tar.gz"; + sha256 = "12ak3ki97shnzki9gvzc52cprpi3wsqmh4dhhv4ly6m39sj3wgxx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-linux-arm64.tar.gz"; sha256 = "1f7h6xl3jk9y29ffjxv9r4a748fwip17x7pazs62zwc3h10a65ac"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-linux-arm64.tar.gz"; + sha256 = "00902vymkc841lpdmgh80a1lipb5bjphiivy7d9xw9cldar35nz3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; + sha256 = "0fd3hgvkr3ch2r5hpmi7h70w4hkbjdyc7z534h151pyc5ssxw8bd"; + } ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-arm64.tar.gz"; - sha256 = "00jzqrnw6khbw5hsaqwi73hx9h3yxdhy2n3jn3h76az27wfjkhkz"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-arm64.tar.gz"; + sha256 = "1hg6i58vb4hlrp3s08m26wivhr7dg902nd8g19rmyfvkhvdjkax5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-arm64.tar.gz"; - sha256 = "116f1psg3wdl81apxlhgz6w1ykhlqxwqk6ahp82mca1h2qc7bg0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0z0v4i2k451fi1xz2k4w9cli8g3mc4d7a9b1gkgcs2wpgrfnifly"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-arm64.tar.gz"; - sha256 = "1rzds5wrq51mzs7sgzwna016qcay3dzp5ys25cxmr47025kyv84p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-arm64.tar.gz"; + sha256 = "0l4mqwap83rk82fnx7djc66mwnllmb49vzhr3kdavdmd5rbw5pd4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-arm64.tar.gz"; - sha256 = "1lqmjkqqq3rlsixv2kam50d5m95c81mn23y3dblbkh8d6qpwkfdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-arm64.tar.gz"; + sha256 = "1q9d00dp61dv4i31c7z3nk9lqpxgyb0w180xfhg4s02vsk9yc8yf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "18h8k6wz1givlkrd2fh6mpyc6syzsqr3a29c36cbly103nvr43jy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-arm64.tar.gz"; + sha256 = "1wpsjm191drz8687gv2d4snv8fdrivw3lqklj5cr67jngwiqhirq"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-arm64.tar.gz"; + sha256 = "1ni5nlfiqpxid3s416avzgx30wjayi51j0v87hkvpmy38m4p1w18"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-arm64.tar.gz"; + sha256 = "1b46cksimynk4f7idp37xn95j0is15zfrxwbs4hv9b3rxayg8s30"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-arm64.tar.gz"; + sha256 = "1ajanl6xgi00qc8a1apzfy45gaqxd7038hc3kmqgkrgzv8b943w4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.3.1-darwin-arm64.tar.gz"; + sha256 = "0hlcfyxmjcq3axg35fx1dj081il60rqs7na0wx573gf028g6jj9v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-arm64.tar.gz"; + sha256 = "13xbscyg7s5cbrrsy5xcl63z31y6aa30r2d8gwchdgla3kqafjmm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "0848db2hv0r5brjdfq1k45bkx7iz0xpwbkmmhg47ymr3g0bhr8db"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-arm64.tar.gz"; sha256 = "16nnb6ql4j2207dgwmrhgx8mg19asf2n450lrmwvdzyvcy5zjm7p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "1z74a9j7ih444lsg4zy3wf8vqqk67jf4cis14x6vpzbpyqpdsyvz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.6.0-darwin-arm64.tar.gz"; + sha256 = "0irhy7vda2abcdzj6g73xh0p3kpxn1xi8agkfq4r9zpqrjp86pcr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.10.0-darwin-arm64.tar.gz"; - sha256 = "1agi0dpck35rqsvxikdcl6xl2fpha2l4144mzgyslki4q86rqmhs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "0nl47s8v47jvr4w3v5s2fnwhm56yb3knfb1za7ncynybgw8hizv0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; @@ -336,24 +543,32 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-arm64.tar.gz"; - sha256 = "1w5nhmc6bzfw0ihv5mwn316sj7w27psknnyffqm1pyw6drp0z58v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-arm64.tar.gz"; + sha256 = "0jbgcw62hmhm5k8q4k948595nm2qslz7wic66iy0jr6ylhpm7hcz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-arm64.tar.gz"; - sha256 = "13w91xxma00zi7llk0hnqi10m90a5b2zhb08j6l0dn7x5a33dqay"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-arm64.tar.gz"; + sha256 = "0rh9b19aqw15wzmijyyk7dv38cgf4abp6pk5abx4bp0277vl2a76"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-arm64.tar.gz"; - sha256 = "0sgg8bnsi5yyfv8gwzy8jw3f0fmkvizrgzh4jyc802qqc449p1ix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "167f7c7mpyjym0sw71adz5ffd7g8zmn87923xmjlrsz3wm6ybsq7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-arm64.tar.gz"; + sha256 = "0dc7cpgvb20s6qyyfm2i4hc4rbg8zdv0j92wc397pacd6i6jhvgn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "0avmwnxj1m8j3jj5w1ims64lxqgig4z8yxpi76000xrv74w625b2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-arm64.tar.gz"; sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-arm64.tar.gz"; - sha256 = "1rq2wxw0kch7xrk0sr1l6fyz1sslyvk44l3jilzbm7mgi0d77w23"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-arm64.tar.gz"; + sha256 = "1n2dh350pwhcvk8vs9mh3g6dijxrg2vh03h9x9fq7qhpgzgxq6km"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz"; @@ -368,26 +583,57 @@ sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.7.0-darwin-arm64.tar.gz"; - sha256 = "0w7gbdzs47ndvfig8qcnn5mar22plxjjsx0d4dgyhf1k391fz1jh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-arm64.tar.gz"; + sha256 = "0xqxk9xp49s0l5cxxz9wg26fg4fj57h4yjpvs4xs8fpaqa1saynd"; } - # pulumi-resource-packet skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.3.0-darwin-arm64.tar.gz"; sha256 = "1i5ipmidg0yspayxyglbjaihajhj1bsk46saxkncfrkvqnh4iq50"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; - sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1dx39lm57sc9j715z62v74fw1gpnr8sn71d6a38gib83iiyagl3s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "1zc8jhrf7vm2p9mjldvgcnfrzh53zvinpikhsc8b206j3pm6gmbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-arm64.tar.gz"; + sha256 = "02x584440hw25nbkj880dd113ywdm280frfadyz2psy1sqfi949h"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "1nl18z6i2p7dmc4f2i7wfw7ss76kmhb3jc4gfyirzp0qr2v8bs8p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-arm64.tar.gz"; + sha256 = "0i6hzqfvsjiyb1bzv70pwr1716scy60w7f8jkv3ayrxddaw7iwwg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-arm64.tar.gz"; + sha256 = "0bn8i1271mm3hqqqlidipsfdalxgc2fx8l4apdjin6k1zrnm44p1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "08dhxd39w7wjpqjfy59vxfipjl45psd6yh53h2g025y8hh80gcrs"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-arm64.tar.gz"; + sha256 = "0aqicfci56i3i9vkpm0ikg3amkzf7is6r9p2477dqm7gjphl9wmy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-arm64.tar.gz"; + sha256 = "1m177hv8bfgsgcch8vbzwkb797i09l7lpfpai27cnljfk03vdhwr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.1.0-darwin-arm64.tar.gz"; sha256 = "1915f5d24vfrwgzvs5nkj5p05fjgqjyxpm54ym2wshl9s4fjb6sp"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.1.0-darwin-arm64.tar.gz"; + sha256 = "0xzh9n69prbaf0795dzmyp4jbzmgqvg4sl2sad3l3mkbgghx4cll"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; + sha256 = "1qaccfqw24g862ij2p49m78hnymg0j2nghshszqrg45v0d0qnknm"; + } ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index c2b0818e5b..91634301c2 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -10,36 +10,51 @@ fi # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.22.1" +VERSION="3.25.1" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. declare -a pulumi_repos pulumi_repos=( + "aiven" + "akamai" + "alicloud" + "artifactory" "auth0" "aws" "azure" + "azuread" + "azuredevops" "cloudflare" "consul" "datadog" "digitalocean" "docker" "equinix-metal" + "fastly" "gcp" "github" "gitlab" + "google-native" "hcloud" "kubernetes" "linode" "mailgun" "mysql" "openstack" - "packet" "postgresql" "random" + "snowflake" + "spotinst" + "sumologic" + "tailscale" + "tls" "vault" + "venafi" "vsphere" + "wavefront" + "yandex" ) # Contains latest release ${VERSION} from diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index ed20f68826..347f6d6f7c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.12"; + version = "1.8.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xDhLd1tCw+W3xXxBgHDKZtMZszXsNelv2dMygHNVq64="; + sha256 = "sha256-5Dvmlzhu7xqJAcAdyjPJ/iMooK7N+Qv8J93uEySYb/s="; }; - vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk="; + vendorSha256 = "sha256-KgoSJcVUtE4ryJLtQXNCdl51sgO94vyb682OdL5CYw8="; subPackages = [ "cmd/stripe" diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index 24b6d4ddcb..22b39ae123 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.37.10"; + version = "0.39.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j3/WE13djrgI7S6YISg9kPIkV0IR0C65QU8zj0z0MVg="; + sha256 = "sha256-tPjODqBJ85B9uEFExs8z2T/RNKuIvphxX8U1tQLRr+A="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-gIcPxSzWzldR9UX4iB2fkwc0BfATT1B+Nge+sGefmj8="; + vendorSha256 = "sha256-fHrKg1+9428feTv3wngV2EjJEUqE5ItbwFu7DxXmkCw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix index 52b2183222..d27a636309 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/synapse-admin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "synapse-admin"; - version = "0.8.4"; + version = "0.8.5"; src = fetchzip { url = "https://github.com/Awesome-Technologies/synapse-admin/releases/download/${version}/synapse-admin-${version}.tar.gz"; - hash = "sha256-hRjguUQUK7tB4VWVKRid4sRTIF/ulm9RmNA6RNUfaak="; + hash = "sha256-5wMKRaLMVJer6W2q2WuofgzVwr8Myi90DQ8tBVAoUX4="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 47320eff77..00fa4cc6d6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.23.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc="; + sha256 = "sha256-xMLSou+8kIQVEJlkA7ygv623hvETcEAdyFPR3HJr5ZQ="; }; - vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA="; + vendorSha256 = "sha256-qRkxDvrqMVOsz5r3m3I+E0HAVoUwFykkfGzTz9Qc/S4="; excludedPackages = "misc"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix index 64b58ee909..c845d890ce 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix @@ -14,15 +14,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.34"; + version = "3.35"; name = "${pname}-${version}"; executable = fetchurl (if use64 then { url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe"; - sha256 = "1zr5qvdnr98xhwlhjikdnx3l5zyx6qnvxqy9p2hrayi0w4w5wmba"; + sha256 = "0jigjs4paci6h897hl1046ks5f812jfb2ihnp78lbah0294shjnj"; } else { url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe"; - sha256 = "1d5zif0f4xfiipjs281xwa3f3blfxbgzqppv3gg3rh5ivxwvaf6g"; + sha256 = "1a3cjhvh2z4n767aqqkv3a7wlda34ssgx9acigdcszgvbksbav1f"; }); # This is from the winbox AUR package: # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e @@ -45,11 +45,8 @@ let comment = "GUI administration for Mikrotik RouterOS"; exec = pname; icon = pname; - type = "Application"; - categories = "Utility"; - extraDesktopEntries = { - StartupWMClass = last (splitString "/" executable); - }; + categories = [ "Utility" ]; + startupWMClass = last (splitString "/" executable); }; # The icon is also from the winbox AUR package (see above). diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 8c886b0e2d..3fa4089b86 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.1.4"; + version = "6.1.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "sha256-wO1YYpJDlhw/HskMCLEf+TJh5Wjb/c4r87dZ7npKO3w="; + sha256 = "sha256-TlZxfYZ83/egAIt/Haaqeax6j5dM8TTUmowWtXe87Uo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix index 2c58b546b6..17d4e78543 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unshield/default.nix @@ -2,16 +2,15 @@ stdenv.mkDerivation rec { pname = "unshield"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "twogood"; repo = "unshield"; rev = version; - sha256 = "19wn22vszhci8dfcixx5rliz7phx3lv5ablvhjlclvj75k2vsdqd"; + sha256 = "1p2inn93svm83kr5p0j1al0rx47f1zykmagxsblgy04gi942iza3"; }; - nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 7237ba880c..87b8940026 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.01.28"; + version = "2022.02.13"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg="; + hash = "sha256-iPeGcEDGvltXqJY50B+yDKYKRF4Oz9GQifn7Pqe8dG8="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix b/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix new file mode 100644 index 0000000000..3792d997aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchurl +, zlib +, fetchFromGitHub +, gnumake +, gcc +, pkg-config +, lua5_4 +, openssl +, jack1 +, python3 +, alsa-lib +, ncurses +, libevdev +}: + +stdenv.mkDerivation rec { + pname = "midimonster"; + version = "0.6.0"; + + buildInputs = [pkg-config gnumake gcc lua5_4 openssl jack1 python3 alsa-lib ncurses libevdev]; + + src = fetchFromGitHub { + repo = "midimonster"; + owner = "cbdevnet"; + rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; + sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; +}; + + doCheck = true; + enableParallelBuilding = true; + + outputs = ["out" "man"]; + + buildPhase = '' + PLUGINS=$out/lib/midimonster make all + ''; + + installPhase = '' + PREFIX=$out make install + + mkdir -p "$man/share/man/man1" + cp assets/midimonster.1 "$man/share/man/man1" + + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp assets/MIDIMonster.svg "$out/share/icons/hicolor/scalable/apps/" + ''; + + meta = with lib; { + homepage = "https://midimonster.net"; + description = "Multi-protocol translation tool"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [keldu]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9b8fc94d2e..9d8a55d770 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.2.3"; + version = "1.4.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + sha256 = "sha256-CdgR9G598LmxA9lhY6yppP3ZZUhTqgMcWccEhSuCcJQ="; }; - cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + cargoSha256 = "sha256-WhlVWQCUGP+K9md0yp6ZD6mGYMso1fUYKDuXXrC2FeI="; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index ce7887ff0f..03446be534 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -13,11 +13,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.17"; + version = "1.2.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"; + sha256 = "sha256-45pVR5Au9FYQGqTHefpms0W9pw0WeI6L0Y5Fj5Ovf2c="; }; postPatch = '' @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cython llfuse + msgpack packaging ] ++ lib.optionals (!stdenv.isDarwin) [ pyfuse3 @@ -82,13 +83,14 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ e2fsprogs + python-dateutil pytest-benchmark pytest-xdist pytestCheckHook ]; pytestFlagsArray = [ - "--numprocesses" "auto" + "--numprocesses" "$NIX_BUILD_CORES" "--benchmark-skip" "--pyargs" "borg.testsuite" ]; @@ -100,6 +102,7 @@ python3.pkgs.buildPythonApplication rec { "test_fuse_mount_hardlinks" "test_fuse_mount_options" "test_fuse_versions_view" + "test_migrate_lock_alive" "test_readonly_mount" # Error: Permission denied while trying to write to /var/{,tmp} "test_get_cache_dir" diff --git a/third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix b/third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix index b2a53f8ad0..c490edd1dc 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/stenc/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , fetchFromGitHub -, genericUpdater -, common-updater-scripts +, gitUpdater , autoreconfHook }: @@ -19,10 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - passthru.updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = { description = "SCSI Tape Encryption Manager"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix index 392c2b960f..98fc0befaf 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; rev = version; - sha256 = "sha256-ayQ52teXWpw3ZvPhfqxFHxMZatQK9NKv/97ovANFZcE="; + sha256 = "sha256-thtBVGgKRYHOAFuxDvuFxcIHoyYAI58AiNCx4vuVXGs="; }; postInstall = diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 6d93717dd9..4f26fc11a2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-029foKJklyOv8qHvgds/yRZ9n1/iA+U7n4O5FViHCOE="; + hash = "sha256-NV2xCC8TaJaWDZSghO8EFuygL8hJLOdx67BWaJ2NKRw="; }; postPatch = '' @@ -73,7 +73,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cryptographic filesystem for the cloud"; homepage = "https://www.cryfs.org/"; - license = licenses.lgpl3; + changelog = "https://github.com/cryfs/cryfs/raw/${version}/ChangeLog.txt"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index fa80e024e3..a7fdf9e2fb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive +, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt +, nlohmann_json, spdlog }: # Common attributes of irods packages { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost + libcxx catch2 nanodbc fmt nlohmann_json spdlog ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -16,18 +19,23 @@ "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" + "-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}" + "-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}" + "-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}" + "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0" "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" ]; - preConfigure = '' - patchShebangs ./packaging - patchShebangs ./scripts - substituteInPlace CMakeLists.txt --replace "DESTINATION usr/bin" "DESTINATION bin" - substituteInPlace CMakeLists.txt --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" - substituteInPlace CMakeLists.txt --replace "DESTINATION usr/lib/" "DESTINATION lib/" + postPatch = '' + patchShebangs ./packaging ./scripts + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION usr/bin" "DESTINATION bin" \ + --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" \ + --replace "DESTINATION usr/lib/" "DESTINATION lib/" \ + --replace "{IRODS_EXTERNALS_FULLPATH_JSON}/include" "{IRODS_EXTERNALS_FULLPATH_JSON}/include/nlohmann" export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out " diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix index cbc9f19c66..7931911b65 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq +, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 +, nanodbc_llvm, fmt, nlohmann_json, spdlog }: let - avro-cpp=avro-cpp_llvm; + avro-cpp = avro-cpp_llvm; + nanodbc = nanodbc_llvm; in let common = import ./common.nix { inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake - help2man texinfo libtool cppzmq libarchive jansson - zeromq openssl pam libiodbc libkrb5 gcc libcxx - boost avro-cpp which catch2; + help2man texinfo libtool cppzmq libarchive jansson + zeromq openssl pam libiodbc libkrb5 gcc libcxx + boost avro-cpp which catch2 nanodbc fmt nlohmann_json + spdlog; }; -in rec { +in +rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.7"; + version = "4.2.11"; pname = "irods"; src = fetchFromGitHub { owner = "irods"; repo = "irods"; rev = version; - sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s"; + sha256 = "0prcsiddk8n3h515jjapgfz1d6hjqywhrkcf6giqd7xc7b0slz44"; fetchSubmodules = true; }; @@ -33,7 +38,7 @@ in rec { # fix build with recent llvm versions NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; - preConfigure = common.preConfigure + '' + postPatch = common.postPatch + '' patchShebangs ./test substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin" @@ -62,36 +67,36 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.7"; - pname = "irods-icommands"; + version = "4.2.11"; + pname = "irods-icommands"; - src = fetchFromGitHub { - owner = "irods"; - repo = "irods_client_icommands"; - rev = version; - sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli"; - }; + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = version; + sha256 = "0wgs585j2lp820py2pbizsk54xgz5id96fhxwwk9lqhbzxhfjhcg"; + }; - patches = [ ./zmqcpp-deprecated-send_recv.patch ]; + patches = [ ./zmqcpp-deprecated-send_recv.patch ]; - buildInputs = common.buildInputs ++ [ irods ]; + buildInputs = common.buildInputs ++ [ irods ]; - preConfigure = common.preConfigure + '' - patchShebangs ./bin - ''; + postPatch = common.postPatch + '' + patchShebangs ./bin + ''; - cmakeFlags = common.cmakeFlags ++ [ - "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" - "-DIRODS_DIR=${irods}/lib/irods/cmake" - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + cmakeFlags = common.cmakeFlags ++ [ + "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" + "-DIRODS_DIR=${irods}/lib/irods/cmake" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" ]; - meta = common.meta // { - description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; - }; + meta = common.meta // { + description = common.meta.description + " CLI clients"; + longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; + }; }); } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch b/third_party/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch index 16b6ba08cb..58e618c663 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch @@ -1,25 +1,3 @@ -diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp ---- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000 -+++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000 -@@ -18,7 +18,7 @@ - try { - boost::filesystem::path path{dl_info.dli_fname}; - path = boost::filesystem::canonical(path); -- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install -+ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install - return path; - } catch(const boost::filesystem::filesystem_error& e) { - THROW(-1, e.what()); -@@ -27,8 +27,7 @@ - - boost::filesystem::path - get_irods_config_directory() { -- boost::filesystem::path path{get_irods_root_directory()}; -- path.append("etc").append("irods"); -+ boost::filesystem::path path("/etc/irods"); - return path; - } - diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py --- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000 +++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000 diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix index 4cfd728b96..73ccd29ad5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "1.4.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mTgJ2DbSQprKKy7wTMXwmUAvHS9tacs9Nk1cmEJW9Sg="; + sha256 = "sha256-q8ekLh0pw+kMIE2SP3cBgrMTfMjY5zRWR58mq5bbB8U="; }; - cargoSha256 = "sha256-Oiiz7I2eCtNMauvr0K2NtB49NJ/6XWVsJ0mMyEgFb7U="; + cargoSha256 = "sha256-eZM48OyYgEJl71I2iu52hKwjDrbSelR4JH/se79bBDs="; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index 41a47566ee..0c92c3e2bf 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.8.22"; + version = "0.9.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-z8w/xzNEebnQJTO4H5PlU5W+69MY1wQwmuz5inXBl1k="; + sha256 = "sha256-Qa93MpTAMCA7vn7LefILDdAKYyRDPPq0vBwmIfegyuU="; }; sourceRoot = "source/cmd/tar2ext4"; diff --git a/third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix b/third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix index 2c18f29bbf..54d3e2a968 100644 --- a/third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/jpsxdec/default.nix @@ -24,7 +24,7 @@ let icon = pname; comment = description; desktopName = "jPSXdec"; - categories = "AudioVideo;Utility;"; + categories = [ "AudioVideo" "Utility" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index 0365a80732..aefa2c3f78 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -54,9 +54,7 @@ stdenv.mkDerivation rec { desktopName = "Android GPU Inspector"; exec = "$out/bin/agi"; icon = "agi"; - type = "Application"; - categories = "Development;Debugger;Graphics;3DGraphics"; - terminal = "false"; + categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index 74a0943afe..122dfe8a8b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-K+NJagRdxnFw410pHDP+OY6yyFu/7mhLvZ8DIz08dsA="; + sha256 = "sha256-2inmcKSdvHs7WaU095liH12Og9ezsNSs2qygltWOclw="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix index 62b4ab6b30..07f605a4cb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/icoutils/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; + # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin + # upgrades to a newer SDK. + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + patchPhase = '' patchShebangs extresso/extresso patchShebangs extresso/extresso.in diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index 13ebb018d5..6dbbf71584 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.97.3"; + version = "10.97.4"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4263"; - sha256 = "qELSUQqzufKjaWwXgkrVFROozD4Wjj/BzN8iUuVffwQ="; + rev = "4275"; + sha256 = "SEKxjlKNJijOk1MNIktSf/YTLxBq8gEHyjLUVtXG5OI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix index 67fe037284..4318140471 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I0I6gb2jG0ZeEp6WwDipe43wuek43CWm0zGBX2hAros="; + sha256 = "sha256-3WFzLyg6335twcAMIjzza9r45ljcFlAzvTqyqXOfs1A="; }; - cargoSha256 = "sha256-EdbyaVrHjjVUNmQM96VKCeU3ss1G/N4OZxFMLvFgRqY="; + cargoSha256 = "sha256-twKiuxRpsiJu+hHrg6kUclX9+BWPUop492C+CkwQF2k="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix index 02a9618481..b48c0a6d16 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "snapdragon-profiler"; - version = "v2021.2"; + version = "2021.2"; src = archive; @@ -72,10 +72,8 @@ stdenv.mkDerivation rec { desktopName = "Snapdragon Profiler"; exec = "$out/bin/snapdragon-profiler"; icon = "snapdragon-profiler"; - type = "Application"; comment = meta.description; - categories = "Development;Debugger;Graphics;3DGraphics"; - terminal = "false"; + categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ]; })]; dontStrip = true; # Always needed on Mono diff --git a/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix index 5f6e655882..ab32657236 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: -stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "structure-synth"; - version = "v1.5"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix index 035bb33eeb..136b5a2415 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "1lanr2y9rchl0xmycsyl0bhnh9mrmr5dj46pglw4lykz4rxslzcx"; + sha256 = "1gdwg15fywya6k6pajkx86kv2d8k85pmisnq53b02br5i01y4k41"; }; buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix index 3695c7ec2c..b0b9c9b07b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vkBasalt"; - version = "0.3.2.4"; + version = "0.3.2.5"; src = fetchFromGitHub { owner = "DadSchoorse"; repo = pname; rev = "v${version}"; - sha256 = "01iplj6dlw2vl35hyci5m5yp8jmzcwng6c3jk3wn97jpv6m3hjqz"; + sha256 = "sha256-1UHxPtpmkDNOJwKXVlRN2lpvRm4XPHNwxOBpEikXxqA="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix index 707e9a95a1..1ef2c807bd 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { desktopName = "XColor"; comment = "Select colors visible anywhere on the screen to get their RGB representation"; icon = "xcolor"; - categories = "Graphics;"; + categories = [ "Graphics" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index aaef2dd2d0..137973d8a6 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.6"; + version = "1.4.9"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78="; + sha256 = "sha256-N9hzyu2etbxlJPD2yUc2T0jxAfhEhshQ8X5R27JBg1E="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { isIbusEngine = true; description = "m17n engine for ibus"; homepage = "https://github.com/ibus/ibus-m17n"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index 0028fa6b7b..4df476eb5c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU="; + sha256 = "sha256-GjXcQyv55yJSAFeNNB+YeCVWav7vMGo/d1FCPoujYjA="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs="; + vendorSha256 = "sha256-WG8OjtfVemtmHkrMg4O0oofsjtFKmIvcmCn9AYAGIrc="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix index 6d1ae6cfe3..6e87d82921 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-dj/6bIJfNt/ZBVucjLRu2FYLoyuWZ72MB20eVCRvo0Y="; + sha256 = "sha256-8DCQAgwXaJxRl6NxzSCow9XpP4HhHw3hlPXvmqpq/nc="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix index fb35684518..d405302282 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.7.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "0anfp3nwsainx9sw4njcmkzczq1rmib3dyncwhcf7y3j9v978d3h"; + sha256 = "sha256-ST1ifON25mizKZQX3fKeqBloXWW9LXDq5JkZIeiguRY="; }; - cargoSha256 = "0npw8f8c0qcprcins0pc12c5w47kv8dd1nrzv4xyllr44vx488mc"; + cargoSha256 = "sha256-/Xh1s4PO336B1ioKe0IKVGDACpMuXOpxA82U6zn2lj0="; prePatch = '' rm .cargo/config.toml diff --git a/third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix new file mode 100644 index 0000000000..d67005053b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/aquosctl/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +let + pname = "aquosctl"; +in +stdenv.mkDerivation { + inherit pname; + version = "unstable-2014-04-06"; + + src = fetchFromGitHub { + owner = "jdwhite"; + repo = pname; + rev = "b5e48d9ef848188b97dfb24bfcc99d5196cab5f6"; + hash = "sha256-FA3LR58KMG5RzSxxnOkVw1+inM/gMGPtw5+JQwSHBYs="; + }; + + installPhase = '' + runHook preInstall + install -Dm0755 aquosctl $out/bin/aquosctl + runHook postInstall + ''; + + meta = with lib; { + description = "Sharp Aquos television RS-232 control application"; + homepage = "https://github.com/jdwhite/aquosctl"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix index 1ba5c750f3..6b217d75d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "07lh5k1krzm7fbkv0jlwbzz5ycn2jg7s12dnqwmy82qqic0sl6fl"; + sha256 = "sha256-uvf3WVflUdh+M90zMDVFVAXi7TZytc8oZ/DexJqpNV4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index b6801be354..558bd4bad3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XF5wMLHdiyasB2H6thk6OrkAm5bZZmlPFlBl02k52qU="; + sha256 = "sha256-U+EHOZntZsHfvLapLpbiIKXSm8Qc1BRqCTR/AFe6yfQ="; }; - cargoSha256 = "sha256-GipH9CBzvfaDqov1v9bKtrsRhUfiQ/AhBi1p+gBTwzM="; + cargoSha256 = "sha256-eSBcrKjgCz8mApLJnpNyWVC8pQVUX8dPiYJDIK470U8="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix index 2c7c2282b4..907420b82d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.44.3"; + version = "3.2.51"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-p3ctULrzXPt9dNs8Ckb7cqdOBpp4qOmEwu0dEVq8lEw="; + sha256 = "sha256-MOs+VoqzHYRSXbOO8voj+3jvtYQnWyYAcTelS594LXA="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 1ac88f3ab9..99461f6b1f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-wBt3tlEKN5Woid43hdXm0+JPdb7axRPYCJD6KQEOZ3M="; + sha256 = "sha256-0v7BD/8Hpl6SLsfWWFC+XCH7Pe2RcziMM6nRTPsOBec="; }; - vendorSha256 = "sha256-7PwqekYz/Um67gKeU7v8p9gIEYGCQ4l9K0jew5HCSo4="; + vendorSha256 = "sha256-QWOVcdFlUFS1kjLmwo2zY3s/sVSRxkeOVBWPyUYjbss="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 005e1f4d02..a60624a904 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloudsql-proxy"; rev = "v${version}"; - sha256 = "sha256-mQYzc5OPYEsxBeSRiPHvYvh8grPOgB5sWB9EBrY3a6A="; + sha256 = "sha256-V/dNS/tbPPkVpgaCkGa5pfH/vj8y7mO9OQDLhgWbRCE="; }; subPackages = [ "cmd/cloud_sql_proxy" ]; - vendorSha256 = "sha256-+vuhOrUvA6W6y/6oEvJtsYixyvRzFPzpbw0Qn0AnYRI="; + vendorSha256 = "sha256-6td7rDye0sBUhDn9YARvdCgdfS/8z+VY1wYcEcUzHBs="; checkFlags = [ "-short" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix index 097605026e..35076a2832 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/colord-gtk/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_412 , libxslt , glib +, withGtk4 ? false , gtk3 , gtk4 , pkg-config @@ -49,13 +50,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ colord - gtk3 + ] ++ (if withGtk4 then [ gtk4 + ] else [ + gtk3 + ]); + + mesonFlags = [ + "-Dgtk4=${lib.boolToString withGtk4}" + "-Dgtk3=${lib.boolToString (!withGtk4)}" ]; meta = with lib; { homepage = "https://www.freedesktop.org/software/colord/intro.html"; license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index dd458c0d51..f74f7855d0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "204"; + version = "205"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-JYo/4pqe2ISpLHn90hTBtr0ffviX8m4lWgVb6zwceP4="; + sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix new file mode 100644 index 0000000000..fdfabf8f77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, which }: + +rustPlatform.buildRustPackage rec { + pname = "dotter"; + version = "0.12.9"; + + src = fetchFromGitHub { + owner = "SuperCuber"; + repo = "dotter"; + rev = version; + sha256 = "0rxinrm110i5cbkl7c7vgk7dl0x79cg6g23bdjixsg7h0572c2gi"; + }; + + cargoSha256 = "0fr2dvzbpwqvf98wwrxv76nwbrv4m9ppx7br4x78gm8dhf2nj4zx"; + + checkInputs = [ which ]; + + meta = with lib; { + description = "A dotfile manager and templater written in rust 🦀"; + homepage = "https://github.com/SuperCuber/dotter"; + license = licenses.unlicense; + maintainers = with maintainers; [ linsui ]; + mainProgram = "dotter"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index f5ce9db110..4357b251b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-0r0cDzW18uF7DHvzkUCHHHN+2M21xdi2ffPwDGMtyw8="; + sha256 = "sha256-qC8AlLyg8MU9ZON0hITTaM5AmRFZMOqJVt7PJ5fCtus="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-LAow4DVqON5vrYBU8v8wzg/HcHxm1GqS9DMre3y12Jo="; + cargoSha256 = "sha256-XW6SIeEmHzicq8pbKJCPYZ5s6jl+kp6Bsjh2WIre4yo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 4d93a592d5..72a6247143 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , platformio , esptool , git @@ -16,25 +15,16 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.2.4"; + version = "2022.2.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RG5wTWEpBEC4zTGJ7XTmnjnhSVAllqXjcr3qYbmhqP4="; + sha256 = "sha256-AoSFtEg7GpUBdIrFCYlOMBRc2nBBtiFEkxoZnKC/xyQ="; }; - patches = [ - (fetchpatch { - # Fix ESPHOME_USE_SUBPROCESS usage in the ESP32 post build script - # https://github.com/esphome/esphome/pull/3246 - url = "https://github.com/esphome/esphome/commit/dcd3f42eda5828c42feadbaa04b703c63899be54.patch"; - hash = "sha256-rF1YHRRHVHfoRs492zmIOmRGPUzxx3s673UVx5UJ3+M="; - }) - ]; - postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index 40ad6851f7..94429323e0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.28"; + version = "0.1.29"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1bSbeY0ijPKQ/bO1pD/gJ6AC1KNhUlQ1CP0ApbHKkPI="; + sha256 = "sha256-g3TycwDtB8+5innRlJukuqD2pSRz71slxOKjgzHve7w="; }; - cargoSha256 = "sha256-d4Kv3CNDrsnit5ukw6EXdgjirGkeTEBZ0nm97ZQ8TZ0="; + cargoSha256 = "sha256-LYUQeDoq5C9p5pMvFtLQegl7Cl6K+21DPzjSrnCqJo8="; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index c02ceaac11..fbdb90b12b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-Z1F63tMO3qzi/PrdVR0WCcPXx5E6PwjYPF99Bolnxc8="; + sha256 = "sha256-nFfzvTCiNlv+EzK51w04JHh8tfsim/8hFCxnZZue5No="; }; - cargoSha256 = "sha256-tGzfIQ4nAFA/mXPL6cOaz97W5tjtPGsmbTSkUDFSAzY="; + cargoSha256 = "sha256-B7uJ9hLN/WhLA/bqoO7WZ38tN0tDMZ2KW/vjfOgcQ3A="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix index 0a1d070d77..eb6101f649 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hakuneko/default.nix @@ -13,11 +13,10 @@ let desktopItem = makeDesktopItem { desktopName = "HakuNeko Desktop"; genericName = "Manga & Anime Downloader"; - categories = "Network;FileTransfer;"; + categories = [ "Network" "FileTransfer" ]; exec = "hakuneko"; icon = "hakuneko-desktop"; name = "hakuneko-desktop"; - type = "Application"; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 5671e73c85..d342822590 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -15,6 +15,7 @@ , javaSupport ? false , jdk , usev110Api ? false +, threadsafe ? false }: # cpp and mpi options are mutually exclusive @@ -25,9 +26,14 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { version = "1.12.1"; - pname = "hdf5"; + pname = "hdf5" + + lib.optionalString cppSupport "-cpp" + + lib.optionalString fortranSupport "-fortran" + + lib.optionalString mpiSupport "-mpi" + + lib.optionalString threadsafe "-threadsafe"; + src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; sha256 = "sha256-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; }; @@ -63,7 +69,9 @@ stdenv.mkDerivation rec { ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] ++ optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java" - ++ optional usev110Api "--with-default-api-version=v110"; + ++ optional usev110Api "--with-default-api-version=v110" + # hdf5 hl (High Level) library is not considered stable with thread safety and should be disabled. + ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; patches = [ ./bin-mv.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix index b33fee8e0b..6030913a22 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { exec = name; icon = name; comment = meta.description; - categories = "Science;DataVisualization;"; + categories = [ "Science" "DataVisualization" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix index 467e85128b..e3a3f79f32 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "hexd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "FireyFly"; repo = "hexd"; rev = "v${version}"; - sha256 = "1lm0mj5c71id5kpqar8n44023s1kymb3q45nsz0hjh9v7p8libp0"; + sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix index 39511f567f..979569dc33 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "0.0.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TP2U2gQHmpAFHr5uh7MCNXZ22k8+U4h0bBxkMiMzof0="; + sha256 = "sha256-czXcncEm2Wm0ezGjNOpcCin5KOZKuimnnMPUWfGE0FY="; }; - vendorSha256 = "sha256-9ehliyOCrWSDHVtmuUFBdw4BY6ygOvr2JxxJ3TvmSFU="; + vendorSha256 = "sha256-YfHsl0AFNQNCg4HEP9FyrHUMMz0SFn5aDRrOruseE5k="; modRoot = "."; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index 22b16c7f9b..cfdc8cba5d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -4,10 +4,9 @@ let desktopItem = makeDesktopItem { desktopName = "JDiskReport"; genericName = "A graphical utility to visualize disk usage"; - categories = "Utility;"; + categories = [ "Utility" ]; exec = "jdiskreport"; name = "jdiskreport"; - type = "Application"; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix index 5aec73bde5..1175739159 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-bzpZuLFSoIjZpK9cbxQEeyRwzuP7aDRG/xn/0056j+c="; + sha256 = "sha256-ETP0BvtfMHznEbM0Vu/gMoRvXn4y2XcXw6CoU60A+Cg="; }; - cargoSha256 = "sha256-o9e0EakIbi+qk0gPxlPGfNvRidmCklieJ94sYBSR3IY="; + cargoSha256 = "sha256-ioD0V1S/kPF5etey04Xz1Iz/jDpyunx9PtpWKdwk21g="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix index 68c2fb781f..eb684f1641 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lockfile-progs/default.nix @@ -1,27 +1,28 @@ { lib, stdenv, fetchurl, liblockfile }: stdenv.mkDerivation rec { - _name = "lockfile-progs"; - version = "0.1.18"; - name = "${_name}-${version}"; + pname = "lockfile-progs"; + version = "0.1.19"; src = fetchurl { - url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; - sha256 = "1rjwn3fh2hy8hmpr66y8yp7v5i3325v1mk0gr7pqhqbyp6j9aad4"; + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.tar.gz"; + sha256 = "sha256-LFcEsByPR0+CkheA5Fkqknsr9qbXYWNUpsXXzVZkhX4="; }; buildInputs = [ liblockfile ]; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/man/man1 install -s bin/* $out/bin install man/*.1 $out/man/man1 + runHook postInstall ''; meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = "http://packages.debian.org/sid/lockfile-progs"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.bluescreen303 ]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 46a979d073..89607f13ac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-pKNcgrhq5sh6AXKCStAIYAjTpW+tcnSheFHohp+Z84k="; + sha256 = "sha256-/LmLz4hTmOjpR4Bqf+hABh3PSeaO/sSz/EgHp+nM20o="; }; - cargoSha256 = "sha256-QonLcAixRR7HEefU6D7cSF/stWFodWLWQI7HAkPJHrY="; + cargoSha256 = "sha256-/KL5c5OeflNDKWuE5Gzqgcew9zf8HFjvmBid+mQSqZE="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix index a9c2a43734..0e27139b5b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.5.0"; + version = "8.6.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-6IUNJ3DE+nRc+bmpDO7l1gXlD6UDGggTSYRMFT57v/Q="; + sha256 = "sha256-rhbwoJwbfR2jdn4cD0ENnCmsyuYypEipVdtKDxW/g48="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index ddd21cbab5..4bfc390335 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -1,24 +1,29 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv }: buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.44.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-JRkS51ybFnvCn3pKhDeXO0R23wzT1uso1PtXZllF1fA="; + sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-4MnUDakBfo3nhSqMjDYiqx6FNZvAB/9DE1yxOvmQAAk="; + vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0="; subPackages = [ "cmd/otelcontribcol" ]; + # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" + # https://github.com/shirou/gopsutil/issues/976 + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index 4ee1749c6d..189f549e17 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,22 +1,55 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 -, libxslt, libarchive, bzip2, xz, json-glib, libsoup +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, gettext +, glib +, libxml2 +, perl +, python3 +, libxslt +, libarchive +, bzip2 +, xz +, json-glib +, libsoup_3 }: stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-JV8ch4us7HDDAg/1qcsPa9hhygAJ8kYI31729i1SQ8A="; + sha256 = "sha256-gCzdU7QWcG6lhE8Ebdz7ZYwbSQa5+UDHmserxQmBymg="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 xz libsoup ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + python3 + ]; + + buildInputs = [ + glib + json-glib + libxml2 + libxslt + libarchive + bzip2 + xz + libsoup_3 + ]; meta = with lib; { description = "Tools for managing the osinfo database"; homepage = "https://libosinfo.org/"; + changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/third_party/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch index a6b7af5f1c..c255a27620 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -1,4 +1,4 @@ -From 977fdfad2ceba7232b4f78144b20640d7fd0aedb Mon Sep 17 00:00:00 2001 +From 196c2e1036ed990bca57c199f271c0359509e9f9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Jun 2018 09:34:18 -0400 Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory @@ -14,19 +14,19 @@ Also at this point nothing should depend on `ostree trivial-httpd`. Makefile-ostree.am | 7 --- Makefile-tests.am | 7 +++ configure.ac | 9 --- - man/ostree-trivial-httpd.xml | 118 ----------------------------------- + man/ostree-trivial-httpd.xml | 116 ----------------------------------- src/ostree/main.c | 5 -- tests/libtest.sh | 13 ++-- - 7 files changed, 12 insertions(+), 153 deletions(-) + 7 files changed, 12 insertions(+), 151 deletions(-) delete mode 100644 man/ostree-trivial-httpd.xml diff --git a/Makefile-man.am b/Makefile-man.am -index bc58103b..bcfde285 100644 +index 78025fff..4aa668f6 100644 --- a/Makefile-man.am +++ b/Makefile-man.am -@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ +@@ -32,12 +32,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ - ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ + ostree-rev-parse.1 ostree-show.1 ostree-sign.1 ostree-summary.1 \ ostree-static-delta.1 -if USE_LIBSOUP -man1_files += ostree-trivial-httpd.1 @@ -38,10 +38,10 @@ index bc58103b..bcfde285 100644 if BUILDOPT_FUSE man1_files += rofiles-fuse.1 diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index f861afe4..497d99b0 100644 +index 82af1681..dabc7004 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am -@@ -144,13 +144,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c +@@ -138,13 +138,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c endif if USE_LIBSOUP @@ -56,10 +56,10 @@ index f861afe4..497d99b0 100644 # This is necessary for the cookie jar bits ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) diff --git a/Makefile-tests.am b/Makefile-tests.am -index fc2f2d91..7343b63f 100644 +index 6bae65cf..47b3ab20 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am -@@ -263,6 +263,13 @@ _installed_or_uninstalled_test_programs += \ +@@ -275,6 +275,13 @@ _installed_or_uninstalled_test_programs += \ $(NULL) endif @@ -74,10 +74,10 @@ index fc2f2d91..7343b63f 100644 test_programs += tests/test-repo-finder-avahi endif diff --git a/configure.ac b/configure.ac -index 46a900f5..2f91cdec 100644 +index 93b98cb9..a588eea6 100644 --- a/configure.ac +++ b/configure.ac -@@ -190,14 +190,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi +@@ -186,14 +186,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) @@ -92,20 +92,20 @@ index 46a900f5..2f91cdec 100644 AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) ]) -@@ -617,7 +609,6 @@ echo " - Rust (internal oxidation): $rust_debug_release +@@ -606,7 +598,6 @@ echo " + introspection: $found_introspection rofiles-fuse: $enable_rofiles_fuse HTTP backend: $fetcher_backend - \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline SELinux: $with_selinux + fs-verity: $ac_cv_header_linux_fsverity_h cryptographic checksums: $with_crypto - systemd: $have_libsystemd diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml deleted file mode 100644 -index d03c12be..00000000 +index 7ba1dae8..00000000 --- a/man/ostree-trivial-httpd.xml +++ /dev/null -@@ -1,118 +0,0 @@ +@@ -1,116 +0,0 @@ - - @@ -126,9 +126,7 @@ index d03c12be..00000000 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public --License along with this library; if not, write to the --Free Software Foundation, Inc., 59 Temple Place - Suite 330, --Boston, MA 02111-1307, USA. +-License along with this library. If not, see . ---> - - @@ -225,7 +223,7 @@ index d03c12be..00000000 - - diff --git a/src/ostree/main.c b/src/ostree/main.c -index a523ff9a..61ea742d 100644 +index 7d17080c..19d9b8b0 100644 --- a/src/ostree/main.c +++ b/src/ostree/main.c @@ -118,11 +118,6 @@ static OstreeCommand commands[] = { @@ -241,10 +239,10 @@ index a523ff9a..61ea742d 100644 }; diff --git a/tests/libtest.sh b/tests/libtest.sh -index 3f5fd931..eacd96de 100755 +index 686f08dc..79f8bd1f 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -160,15 +160,12 @@ fi +@@ -174,15 +174,12 @@ fi if test -n "${OSTREE_UNINSTALLED:-}"; then OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd else @@ -266,5 +264,5 @@ index 3f5fd931..eacd96de 100755 files_are_hardlinked() { -- -2.25.0 +2.35.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index b5b23ee6a2..a4ecb4c527 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -20,7 +20,7 @@ , autoconf , automake , libtool -, fuse +, fuse3 , util-linuxMinimal , libselinux , libsodium @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.6"; + version = "2022.1"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-6AYxyxNj1HNP6dDJH2mmi+OEgWbW4EgdsZzkSpy09TE="; + sha256 = "sha256-Q6AOeFaEK4o09mFvws4c4jjvQyEMykH3DmtLDSqfytU="; }; patches = [ @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { libsoup glib-networking gpgme - fuse + fuse3 libselinux libsodium libcap diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch b/third_party/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch index 1eccd74bfa..6b154d3def 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/fix-1592.patch @@ -1,8 +1,19 @@ +--- a/tests/basic-test.sh ++++ b/tests/basic-test.sh +@@ -226,7 +226,7 @@ cd ${test_tmpdir} + if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then + fatal "committed non-bootable tree" + fi +-assert_file_has_content err.txt "error: .*No such file or directory" ++assert_file_has_content err.txt "error:.*No such file or directory" + echo "ok commit fails bootable if no kernel" + + cd ${test_tmpdir} diff --git a/tests/pull-test.sh b/tests/pull-test.sh -index a8bc49a9..4a08ebb5 100644 +index f4084290..4af5ec6f 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh -@@ -275,7 +275,7 @@ +@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then fatal "pull with mixed refs succeeded?" fi @@ -11,7 +22,7 @@ index a8bc49a9..4a08ebb5 100644 ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck -@@ -286,7 +286,7 @@ +@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc fatal "pulled nonexistent branch" fi # So true @@ -20,7 +31,7 @@ index a8bc49a9..4a08ebb5 100644 echo "ok pull-local nonexistent branch" cd ${test_tmpdir} -@@ -593,5 +593,5 @@ +@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then fatal "pull of invalid ref succeeded" fi @@ -28,10 +39,10 @@ index a8bc49a9..4a08ebb5 100644 +assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' echo "ok pull got HTML for a ref" diff --git a/tests/test-config.sh b/tests/test-config.sh -index 7e913d32..69d1675d 100755 +index 2d9aaf53..f1e28614 100755 --- a/tests/test-config.sh +++ b/tests/test-config.sh -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/" if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then assert_not_reached "ostree config get should error out if too many arguments are given" fi @@ -40,7 +51,7 @@ index 7e913d32..69d1675d 100755 echo "ok config get" ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only -@@ -63,7 +63,7 @@ +@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/" if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then assert_not_reached "ostree config set should error out if too many arguments are given" fi @@ -48,8 +59,8 @@ index 7e913d32..69d1675d 100755 +assert_file_has_content err.txt "Too many arguments given" echo "ok config set" - # Check that "ostree config unset" works -@@ -78,7 +78,7 @@ + # Check that using `--` works and that "ostree config unset" works +@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; fi # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 @@ -58,7 +69,7 @@ index 7e913d32..69d1675d 100755 # Check that it's idempotent ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs -@@ -95,5 +95,5 @@ +@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then assert_not_reached "ostree config unset should error out if too many arguments are given" fi @@ -66,10 +77,10 @@ index 7e913d32..69d1675d 100755 +assert_file_has_content err.txt "Too many arguments given" echo "ok config unset" diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh -index dc6bcfeb..4a5eef55 100755 +index 3dbcdd23..d6359979 100755 --- a/tests/test-fsck-collections.sh +++ b/tests/test-fsck-collections.sh -@@ -100,7 +100,7 @@ +@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -78,7 +89,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 3 fsck detects missing ref bindings" -@@ -113,7 +113,7 @@ +@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -87,7 +98,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -127,7 +127,7 @@ +@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -96,7 +107,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -147,7 +147,7 @@ +@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings" if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -105,7 +116,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -186,7 +186,7 @@ +@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum) if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -114,7 +125,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 9 fsck detects missing ref bindings" -@@ -205,7 +205,7 @@ +@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings" if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -124,10 +135,10 @@ index dc6bcfeb..4a5eef55 100755 echo "ok 11 fsck ignores unreferenced ref bindings" diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh -index bb7eae89..62a3bcd7 100755 +index 2f5ea634..0f63853c 100755 --- a/tests/test-remote-add.sh +++ b/tests/test-remote-add.sh -@@ -83,7 +83,7 @@ +@@ -81,7 +81,7 @@ echo "ok remote delete" if $OSTREE remote delete nosuchremote 2>err.txt; then assert_not_reached "Deleting remote unexpectedly succeeded" fi diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index a52ad6920b..2eca9f6891 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 = "20220122"; + version = "20220222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-uCIaIUErylcq2ERbeYHf1iWjxtSHcs2kaN+1uIYzfgA="; + sha256 = "sha256-+BaCuGPq1/uaEUdUAB6ShvlUVQpXo882yQA6gEempEU="; }; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix index d6e3588f6b..c7c4fd1f89 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix @@ -1,4 +1,4 @@ -{ buildPerlPackage, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS +{ buildPerlPackage, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS , TextCSV }: buildPerlPackage rec { pname = "pgbadger"; @@ -27,5 +27,6 @@ buildPerlPackage rec { description = "A fast PostgreSQL Log Analyzer"; license = lib.licenses.postgresql; maintainers = lib.teams.determinatesystems.members; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pgbadger.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix new file mode 100644 index 0000000000..7605f49b15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/precice-config-visualizer/default.nix @@ -0,0 +1,23 @@ +{ lib, python3Packages, fetchFromGitHub}: + +python3Packages.buildPythonApplication rec { + pname = "config-visualizer"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "precice"; + repo = pname; + rev = "60f2165f25352c8261f370dc4ceb64a8b422d4ec"; + sha256 = "sha256:0mqzp2qdvbqbxaczlvc9xxxdz6hclraznbmc08ldx11xwy8yknfr"; + }; + + propagatedBuildInputs = with python3Packages; [ lxml pydot ]; + doCheck = false; + + meta = with lib; { + description = "Small python tool for visualizing the preCICE xml configuration "; + homepage = "https://github.com/precice/config-visualizer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 871398822a..fe506a31c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-vjcAvTdqrZFmtVDkG/K4mHiInF63BPOyUXLVKIOq7qU="; + sha256 = "sha256-2j1K9enoPBPLL+0oOhzcYVxfsjb8BzsfeHNi9TJOnmc="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix index 6db1675fe0..5d8b648469 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rates"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lunush"; repo = pname; rev = version; - sha256 = "sha256-ivJ6rD4+EYeMg6nOWzf3lp521+7NTBq5vCn7648q0T8="; + sha256 = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw="; }; - cargoSha256 = "sha256-dsWAxYFB096SZN5tfzEMokdQ8qw1aR/6Hmjtkdw1L8E="; + cargoSha256 = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix index 22b669e4fd..91251abde1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.04.00"; + version = "03.04.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI="; + sha256 = "sha256-8INtFmftMb1JSotUdDtMXdSm+UE/8zQW/wIOExr8nkI="; }; propagatedBuildInputs = tclLibraries; diff --git a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix index e7e0e42081..884d5317cb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }: +{ lib, stdenv, fetchurl, autoreconfHook, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { pname = "screen"; @@ -16,13 +16,6 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; - sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; - stripLen = 1; - }); - nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index 048e8eb600..78c86aeff7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec { icon = "Sharedown"; comment = "An Application to save your Sharepoint videos for offline usage."; desktopName = "Sharedown"; - categories = "Network;Archiving"; + categories = [ "Network" "Archiving" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix new file mode 100644 index 0000000000..27eead6e1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/shellspec/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "shellspec"; + version = "0.28.1"; + + src = fetchFromGitHub { + owner = "shellspec"; + repo = pname; + rev = version; + sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + checkPhase = '' + ./shellspec --no-banner --task fixture:stat:prepare + ./shellspec --no-banner spec --jobs "$(nproc)" + ''; + + # "Building" the script happens in Docker + dontBuild = true; + + meta = with lib; { + description = + "A full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; + homepage = "https://shellspec.info/"; + changelog = + "https://github.com/shellspec/shellspec/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix new file mode 100644 index 0000000000..afa21afa66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/smug/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "smug"; + version = "0.2.7"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "ivaaaan"; + repo = "smug"; + rev = "3399f02a6e01324f5bb881f6b049c9e8d94733ee"; + sha256 = "178125835dhnaq9k42yv4pfxpyhgb5179wrxkimb59fy0nk8jzx8"; + }; + + vendorSha256 = "1rba5rpvlr8dyhj145b5i57pm4skfpj3vm7vydkn79k6ak6x985x"; + + meta = with lib; { + homepage = "https://github.com/ivaaaan/smug"; + description = "Smug - tmux session manager"; + license = licenses.mit; + maintainers = with maintainers; [ juboba ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix index 3d2042978f..1e0b50d6f8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, makeWrapper -, dpkg, patchelf +{ stdenv, lib, fetchurl +, dpkg, patchelf, wrapGAppsHook +, hicolor-icon-theme , gtk3, glib, systemd , xorg, nss, nspr , atk, at-spi2-atk, dbus @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-CUOdpR8RExMLeOX8469egENotMNuPU4z8S1IGqA21z0="; }; - nativeBuildInputs = [ makeWrapper dpkg ]; + nativeBuildInputs = [ wrapGAppsHook dpkg ]; + buildInputs = [ glib hicolor-icon-theme ]; unpackPhase = '' mkdir pkg @@ -39,8 +41,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir $out - mv opt/StarUML $out/bin + mkdir -p $out/bin + mv opt $out + + mv usr/share $out + rm -rf $out/share/doc + + substituteInPlace $out/share/applications/staruml.desktop \ + --replace "/opt/StarUML/staruml" "$out/bin/staruml" mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ @@ -48,9 +56,15 @@ stdenv.mkDerivation rec { patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/staruml - wrapProgram $out/bin/staruml \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} + $out/opt/StarUML/staruml + + ln -s $out/opt/StarUML/staruml $out/bin/staruml + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' $out/lib:${LD_LIBRARY_PATH} + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 90273068f3..0d15386641 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -6,6 +6,7 @@ , bison , ncurses , libevent +, utf8proc }: let @@ -49,12 +50,12 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libevent - ]; + ] ++ lib.optionals stdenv.isDarwin [ utf8proc ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix index d8ba086112..4b521ed9dd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: +{ lib, stdenv, fetchurl, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "273"; + version = "274"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; + sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4="; }; - nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix index 00c6441cff..2977588137 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -1,17 +1,18 @@ { lib , buildGoModule , fetchFromGitHub -, installShellFiles }: +, installShellFiles +}: buildGoModule rec { pname = "upterm"; - version = "0.6.7"; + version = "0.7.3"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "sha256-JxyrH48CXaaa+LkTpUPsT9aq95IuuvDoyfZndrSF1IA="; + hash = "sha256-eEzFqKYhsG5e1DVLWJq08NM9xyfn1yPNV0NIgOErj4E="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix new file mode 100644 index 0000000000..5066145b72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: +stdenv.mkDerivation rec { + pname = "vtm"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "netxs-group"; + repo = "vtm"; + rev = "v${version}"; + sha256 = "sha256-Z6PSx7TwarQx0Mc3fSRPwV7yIPJK3xtW4k0LJ6RPYRY="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "../src" ]; + + meta = { + homepage = "https://vtm.netxs.online/"; + description = "Terminal multiplexer with window manager and session sharing"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ahuzik ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix index a78b685696..a1811629af 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20210210"; + version = "20220215"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-D5ii4wWYKRXxUgmEw+hpjjrNUI7iEHEVKMifWn6n8EY="; + sha256 = "sha256-SmWZjF4SzwjO0s/OEZrbRPqEKsFJXQ8VDyHIpnhZFaE="; }; meta = with lib; { - description = "Tests the compatibility so-called 'VT100-compatible' terminals"; + description = "Tests the compatibility of so-called 'VT100-compatible' terminals"; homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix index b9c9d73006..e936ca584b 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.35.4"; + version = "1.37.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-MG2ROWQh8A7LrdOnDWLG9AsHjzfv84KjmjZXhJlMrLQ="; + sha256 = "sha256-1JOsE8u4+LlWL9nU/fXIqVME1VsgxZV84lJXNTY2pZg="; }; - vendorSha256 = "sha256-8FaM83+d1VQ/9le2hD0nqErhH/jOHMxbNz2o4D3qWb8="; + vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y="; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix new file mode 100644 index 0000000000..34f4581ba0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "writedisk"; + version = "1.2.0"; + + src = fetchCrate { + inherit version; + pname = "writedisk"; + sha256 = "sha256-f5+Qw9Agepx2wIUmsAA2M9g/ajbFjjLR5RPPtQncRKU="; + }; + + cargoSha256 = "sha256-SMAhh7na+XQyVtbfzsBGOCdBRLP58JL1fPSBVKFkhdc="; + + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Small utility for writing a disk image to a USB drive"; + homepage = "https://github.com/nicholasbishop/writedisk"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix index 633fd2fb7e..7176ea0953 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytarchive"; - version = "unstable-2021-12-29"; + version = "unstable-2022-02-16"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "2d87608c0b159da876538380b3e613bce2797599"; - sha256 = "sha256-/cnyKcbgd6I0Ad5aZQd2pCbnU6HZYfuPHK2Ty7yYgHs="; + rev = "66a1ca003de7302c99bda943500257d5fd374199"; + sha256 = "sha256-6eLNyInqXB+LWbZ18DvXbTdpRpiCDMGwJaiyQfZZ4xM="; }; vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index 3bb0f4382b..fd58e79063 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-NJLXXam7FmBWj9sM+S71e5o5e6OtVpw0m32kUo3Fbec="; + hash = "sha256-dQq7p/aK9iiyuhuxh5eVXR9GLukwsvosONpQTI0mknw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index 6a09ba4e0e..20d338989c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -6,22 +6,24 @@ , pkg-config , libiconv , openssl +, DiskArbitration +, Foundation , zellij , testVersion }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-GYbRu2ZEFswyOBUbg6jdAZQRogIDT/YolEElZT8h744="; + sha256 = "sha256-MTSM8fYAcNcmjg6bkOEN+U5+WilaEy52EJOfyoIy3Zg="; }; - cargoSha256 = "sha256-ogWFAO3xMH4vho9SRjyeHCDxRtAx6exGkMpNhz2VOLA"; + cargoSha256 = "sha256-2QEDrxTz7I9hF+WfVKkGLXHWZjQ5by/zuO16NGOJSKk="; nativeBuildInputs = [ installShellFiles @@ -32,6 +34,8 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv + DiskArbitration + Foundation ]; preCheck = '' @@ -52,6 +56,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh _0x4A6F ]; + maintainers = with maintainers; [ therealansh _0x4A6F abbe ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix new file mode 100644 index 0000000000..5d49842237 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "aardvark-dns"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6O/7GoGH0xNbTfIFeD5VLrifNFpHcxxG0bdq/YQb3Ew="; + }; + + cargoHash = "sha256-YdHIyCJ00MKH8PL0osOqQIMwaws3+cOUwvhvA8mOp84="; + + preBuild = '' + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + meta = with lib; { + description = "Authoritative dns server for A/AAAA container records"; + homepage = "https://github.com/containers/aardvark-dns"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + 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 7b8e6e07dc..867943783b 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.16.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-V3FqiAvHnd3q3yhrhDaeka22R+mBqFdPjGqY4FGCx9M="; + sha256 = "sha256-AFy0Ob6caU3yGC9s5Til5sYZ3A4qiEeU96OfeMlR/Q4="; }; - vendorSha256 = "sha256-0hor9Sldl8HhlKfYhWhb79wnZSMn5/Hg0Ux937qQkT4="; + vendorSha256 = "sha256-6qfHoP7TOmRZLIiijRfQxyct+486TXQ18cdH8pdhwmQ="; outputs = [ "out" "wordlists" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index f22817c3b3..3745856a8c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.7.4"; + version = "0.7.5"; src = let @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; x86_64-darwin = "darwin_amd64"; + aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-5owLce0A7AwKDXB/JsUJZeHJHhrHT4/kA6XG+ZwhuyU="; - aarch64-linux = "sha256-WDFIr+GOip70Di5u9fRu2lVWPMJe9urYTcuc2hTMD7g="; - x86_64-darwin = "sha256-FGsY7+bC7n3fu1SsLl92FPytj8MgL4nT95CC6GM6vss="; + x86_64-linux = "sha256-wqNeeEQhR8cj7Gpbzp7UQV0j+w0peo41uKqgK9BoLH4="; + aarch64-linux = "sha256-HK/6eMBWUW1IbYE5RpInhcQuIw16X9vQEZmOBje9Yzk="; + x86_64-darwin = "sha256-ghgkPlEN9DHFviQzcGS/+oG+9Qqy2AfJ2IEyiSMJwwY="; + aarch64-darwin = "sha256-F4iOCxAm8s34KktuS5PRPkIg9A0179H6zlOM3OuTyUw="; }; in fetchzip { @@ -60,7 +62,6 @@ stdenv.mkDerivation rec { and does not require an agent to be installed on every end host. ''; license = licenses.mpl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ jk techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh b/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh index 4373393071..0533c07967 100755 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/update.sh @@ -31,9 +31,11 @@ BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/ha BOUNDARY_LINUX_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_amd64") BOUNDARY_DARWIN_X64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_amd64") BOUNDARY_LINUX_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "linux_arm64") +BOUNDARY_DARWIN_AARCH64_SHA256=$(fetch_arch "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" +replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256" diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix index ac81453e65..ff65420a98 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20210701"; + version = "20220401"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MYd9q1pjrdLbgIoIakHeBuCjlEjXib0CNivZiqk5hns="; + sha256 = "sha256-H6lH4LG7MhxQsGVs3CSVX9FEywONDrS5bsjzw5b5k/U="; }; - vendorSha256 = "sha256-iaaXLpzN69yHBcAi9GS+G7LupX/7VABo1XFNegk+i3Q="; + vendorSha256 = "sha256-3ndpmERtaLHuTMMUcq+OenBxgW3+qy/bZCiWRgI0L84="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix index 82a418d5de..2f885d7a85 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkip"; - version = "0.17.3"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sSXl2I5vZ8PVLaZWlMl5phcqQ1k1OBy5v+X0O8nHtvw="; + sha256 = "sha256-cQY77csZ7UPi09vUOdn3AKrLzGMI2BE16gfL1wDXxZA="; }; - vendorSha256 = "sha256-aiqnJ1PjrwSC6YtixNvyTxgbs8z2radcETNhKHGlPk0="; + vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; # Requires network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index eb7a4f859e..fa55c6e94e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.5.1"; + version = "9.5.2"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-86uM58MCdmt0sSEIgRRQYPr6Gf4lphFOcqRU7WD5HnI="; + sha256 = "sha256-Ha84frbyRDxCRIDezlKeA+Fv9+rmpCoU+EAgMBkf3fo="; }; - vendorSha256 = "sha256-xL7aiMlnSzZsAtX3NiWfNcrz8oW7BuCLBUnJvx1ng2Y="; + vendorSha256 = "sha256-uaSDder/uzy708YE1xqpL9Te4629JD2IiVSCYhYzPwg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix index 66c912b47f..63fc1cffd9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { version = "0.8.0"; - pname = "davix"; + pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # "please ignore the GitHub-generated tarballs, as they are incomplete" # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { - url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; + url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ="; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 4e88b652e3..ee2a87b9d5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.41.2"; + version = "0.41.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bo6OxHNZYA1cP2iP/QnaN80DcwBGIVCQXH/mc75hFUY="; + sha256 = "sha256-p5kfpqqTg1wXPYTBScjUGClSKT6yb7ZSnzia2xTQwfo="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 63560ce7ad..035a99103f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { "-std=c++17" ]; - LDFLAGS = lib.optional stdenv.cc.isClang [ - "-lc++fs" - ]; - meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index 108cd769a7..426953cf29 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-dxOR+rgTaSgauVBz5PgSn8MPmsdQTEGH7h5bXFIT7wM="; + sha256 = "sha256-OXyp2cQmt311CPAcJQeWKGRHFYNL6E+f2TmUuT80/z4="; }; - cargoSha256 = "sha256-w8+wn8jnsEZAkMEZRWMaytskhG+noMPjk4+U+SdghMQ="; + cargoSha256 = "sha256-TwegOBf7dILL7DKohIVfa8IRTU4F9u24tDrrONIGF0U="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index df159d2923..8789ae6fa1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "2.34.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; + sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; }; - vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; + vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix index a20d63af23..b2744b8ed9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; + sha256 = "sha256-PD/3WIxNPtC7s4+2ogWG5DEm717rYQLMx9XA06Q6ebo="; }; - vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords="; + vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 4703aaf0e0..3ca9d3b553 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - sha256 = "sha256-7o7Tj0jWFIOLmpHXWT6zcyowm7vnqMDTf0S4zHkWQ2Q="; + sha256 = "sha256-Q7M/vDhECEIQ8s8qt1U7wESqv+Im79TyZ6s2vqjU5ps="; }; - cargoSha256 = "sha256-t+68Rea74RE43TXTSyhZCLXCdBfh7K92Z/amO+wBUuI="; + cargoSha256 = "sha256-cnmjfvMqq8VDMvjFPnjmmH57Gaqttk36AwEtuuAT6qU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index 14d790fede..f6828470fc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gHzafx3nIrdLyiGlz5v6pJ8XVT+7tDN59rsdfp1V/Q0="; + sha256 = "sha256-XDVt5fml2zYXOcZYXnxxGu4uaUA75DnRlFkbcc6tDag="; }; - vendorSha256 = "sha256-6K644KSmFEA60yMnw7GmCmycsb5x2stvc0unyV4pF9g="; + vendorSha256 = "sha256-jHNjvh4rpZdQ/RC9gN3KXnuOLkJX8Ow5GV+Qwfyvx1o="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index b702c51136..afc57cb723 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-LeNCT9dFK+HBwT1eCZQGEoUFXFcEaxyzwiDWdhHQ2n4="; + sha256 = "sha256-1vo8ZvcH/5O1vSfOaecKiWTXtweFSLUYaNR9ffOUP+Q="; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix index 8f081a1141..31c4488f85 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.12.3"; + version = "1.12.4"; src = fetchCrate { inherit version; pname = "https"; - sha256 = "sha256-g0WQdfncGGrf/sCvytvF5xHWb2L0mBiT3j0kj8fZN8k="; + sha256 = "sha256-4+iIFLtPVs4PHOzfXfretCuZ0iBcqMVNnYFjEVhvBjk="; }; - cargoSha256 = "sha256-L5eN3jg3xc4J5j14Vzcy8qj15q9WhshPVjLzegieyxU="; + cargoSha256 = "sha256-VOzMf9hOrAEGwtW9h8CnG/Df2KgEVhNqqdL762Gs2dE="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 8bdd18c8ea..01328f66a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.40.0"; + version = "2.41.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-Cld5TP2YoLzm73q7uP/pwqEeUsT5uMPAUx9HABOVeZA="; + sha256 = "sha256-fQqbZYb0brGmGf7Yc/2Zd5BZ+YOkGYC3o9uhShYdAE4="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/imapproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/imapproxy/default.nix deleted file mode 100644 index ca0ce6f933..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/imapproxy/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl, openssl, ncurses}: - -stdenv.mkDerivation rec { - pname = "imapproxy"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2"; - sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; - }; - - buildInputs = [ openssl ncurses ]; - - patchPhase = '' - sed -i -e 's/-o \(root\|bin\) -g \(sys\|bin\)//' Makefile.in - ''; - - meta = { - homepage = "http://imapproxy.org/"; - description = "It proxies IMAP transactions caching server connections"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index 3458e5c6e5..c58989aade 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "2.0.1"; # only even minor versions are stable + version = "2.0.2"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-9Qu5qVTjFDFrQDOhddyAdJa7nBdUEQvZKiHBZanoTFc="; + sha256 = "sha256-jSghO9yOK7hwo4OzCsHlPVTh66Q9L4blFRsItmqmzzI="; }; patches = [ ./dont-create-var.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 532c8c14ab..faccef5769 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; }; + separateDebugInfo = true; + postPatch = '' sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index be67bca63c..4fbdec621b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-02-13T23-26-13Z"; + version = "2022-03-03T21-12-24Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1Led0OTJO/nN8NisLD/of5IybwYOygsL4xwQmXYCxfs="; + sha256 = "sha256-z+t8aMyGlqXcooCzJgn0xxOhuS+p3/qMTBJByDJPd40="; }; - vendorSha256 = "sha256-DDtpRKBetVyeUYk0OGddKkAEe3mqL7d+cbSdIbXeZ2s="; + vendorSha256 = "sha256-mk0ga3o6LeZ4uwV3vlP6qyFXLiORwNQLhXoCxSmvXsU="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix index 750461b708..617f4de047 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.8.0"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ckTIHtS7lUUP1Ozt+6O0CAyl3JrcXFqiBC6c+Uc7lwA="; + sha256 = "sha256-qEIPu4miZpWL19N36DsKMbckXbHDTTZjp2ccZrV3LFc="; }; vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix new file mode 100644 index 0000000000..34e60b25e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, mandown +}: + +rustPlatform.buildRustPackage rec { + pname = "netavark"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-r9NoPDFCqmzESxlovs91j0OyunGDmfWJXN+U1f0w2QQ="; + }; + + cargoHash = "sha256-/N9oKzcAwaxI2BbeoYZ2quN+Z3UO67ecpogK2SRG9Dw="; + + preBuild = '' + substituteInPlace Cargo.toml \ + --replace 'build = "build.rs"' "" + + rm build.rs + + export \ + VERGEN_BUILD_SEMVER="${version}" \ + VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ + VERGEN_GIT_SHA="${src.rev}" \ + VERGEN_RUSTC_HOST_TRIPLE="" + ''; + + nativeBuildInputs = [ installShellFiles mandown ]; + + postBuild = '' + make -C docs + installManPage docs/*.1 + ''; + + meta = with lib; { + description = "Rust based network stack for containers"; + homepage = "https://github.com/containers/netavark"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix index 1a7b93eef8..2146dd63b9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netdiscover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "netdiscover"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = pname; rev = version; - sha256 = "13fp9rfr9vh756m5wck76zbcr0296ir52dahzlqdr52ha9vrswbb"; + sha256 = "sha256-4pSGWMTOMECXKpba5739OQA8FIuNmffFbniU9Gd4GlM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix index 9cee2fbdab..c039b47d16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -15,6 +15,8 @@ , mobile-broadband-provider-info , gobject-introspection , gtk3 +, withGtk4 ? false +, gtk4 , withGnome ? true , gcr , glib @@ -56,6 +58,8 @@ stdenv.mkDerivation rec { networkmanager isocodes mobile-broadband-provider-info + ] ++ lib.optionals withGtk4 [ + gtk4 ] ++ lib.optionals withGnome [ # advanced certificate chooser gcr @@ -63,6 +67,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgcr=${lib.boolToString withGnome}" + "-Dlibnma_gtk4=${lib.boolToString withGtk4}" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix index 3c6eff4d60..c4ba4c869a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nss-pam-ldapd"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl { url = "https://arthurdejong.org/nss-pam-ldapd/${pname}-${version}.tar.gz"; - sha256 = "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh"; + sha256 = "sha256-xtZh50aTy/Uxp5BjHKk7c/KR+yPMOUZbCd642iv7DhQ="; }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LDAP identity and authentication for NSS/PAM"; homepage = "https://arthurdejong.org/nss-pam-ldapd/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix index d99fe89a47..067c614f58 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = version; - sha256 = "sha256-mb1xmv2jM8XpKiUX/IlVctKUimMeF1oMDnT6YMZ0nCY="; + sha256 = "sha256-1grRt0F/myVzK+DMSeK5K0Ui8bJANEtE6/6IY+ZbPAw="; }; nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index e3491460e0..1ff0299a6b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.2.1"; + version = "5.4.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs="; + sha256 = "sha256-8+0xIxDjkDJLM7ov//KQzoEpNSB6FJPsXAmNCkQb5Rw="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/opendrop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/opendrop/default.nix new file mode 100644 index 0000000000..6a89372151 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/opendrop/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchPypi +, fleep +, libarchive-c +, pillow +, requests-toolbelt +, setuptools +, zeroconf }: + +buildPythonApplication rec { + pname = "opendrop"; + version = "0.13.0"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-FE1oGpL6C9iBhI8Zj71Pm9qkObJvSeU2gaBZwK1bTQc="; + }; + + propagatedBuildInputs = [ + fleep + libarchive-c + pillow + requests-toolbelt + setuptools + zeroconf + ]; + + # There are tests, but getting the following error: + # nix_run_setup: error: argument action: invalid choice: 'test' (choose from 'receive', 'find', 'send') + # Opendrop works as intended though + doCheck = false; + + meta = with lib; { + description = "An open Apple AirDrop implementation written in Python"; + homepage = "https://owlink.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index e636950cd9..25b4206641 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -48,7 +48,12 @@ buildGoModule rec { postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd - mkdir -p $out/lib/systemd/system + mkdir -p $out/etc/opensnitchd $out/lib/systemd/system + cp system-fw.json $out/etc/opensnitchd/ + substitute default-config.json $out/etc/default-config.json \ + --replace "/var/log/opensnitchd.log" "/dev/stdout" \ + --replace "iptables" "nftables" \ + --replace "ebpf" "proc" substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix index 8c0b7686d8..79a8af4ee0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { unicode-slugify pyinotify notify2 - # pyasn # dpendency missing but not mandatory + pyasn ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index e8cad75698..36125a5893 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "8.8p1"; + version = "8.9p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; + sha256 = "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; }; extraPatches = [ @@ -33,9 +33,9 @@ in # HPN Patch from FreeBSD ports (fetchpatch { name = "ssh-hpn.patch"; - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/a981593e/security/openssh-portable/files/extra-patch-hpn"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ae66cffc19f357cbd51d5841c9b110a9ffd63e32/security/openssh-portable/files/extra-patch-hpn"; stripLen = 1; - sha256 = "sha256-+JvpPxktZAjhxLLK1lF4ijG9VlSWkqbRwotaLe6en64="; + sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/owl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/owl/default.nix new file mode 100644 index 0000000000..5a726c25a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/owl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libev, libnl, libpcap }: + +stdenv.mkDerivation rec { + pname = "owl"; + version = "unstable-2022-01-30"; + + src = fetchFromGitHub { + owner = "seemoo-lab"; + repo = "owl"; + rev = "8e4e840b212ae5a09a8a99484be3ab18bad22fa7"; + sha256 = "sha256-kFk+JFLGWGBu5FPH3qp/Bxa6t04f1kpeHz3H8GNF3fg="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libev libnl libpcap ]; + + meta = with lib; { + description = "An open Apple Wireless Direct Link (AWDL) implementation written in C"; + homepage = "https://owlink.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} 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 c2e5f45682..fc389f2c4d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -20,8 +20,13 @@ , libX11 }: +# daemon and client are not build monolithic +assert monolithic || (!monolithic && (enableDaemon || client)); + stdenv.mkDerivation rec { - pname = "amule"; + pname = "amule" + + lib.optionalString enableDaemon "-daemon" + + lib.optionalString client "-gui"; version = "2.3.3"; src = fetchFromGitHub { @@ -34,9 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ - zlib wxGTK30-gtk3 perl cryptopp.dev libupnp boost + zlib + wxGTK30-gtk3 + perl + cryptopp.dev + libupnp + boost ] ++ lib.optional httpServer libpng - ++ lib.optional client libX11; + ++ lib.optional client libX11; cmakeFlags = [ "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 8d8069bec2..dd165fa138 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4="; + sha256 = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix new file mode 100644 index 0000000000..22966d7afa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/rdap/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "rdap"; + version = "2019-10-17"; + vendorSha256 = "sha256-j7sE62NqbN8UrU1mM9WYGYu/tkqw56sNKQ125QQXAmo="; + + src = fetchFromGitHub { + owner = "openrdap"; + repo = "rdap"; + rev = "af93e7ef17b78dee3e346814731377d5ef7b89f3"; + sha256 = "sha256-7MR4izJommdvxDZSRxguwqJWu6KXw/X73RJxSmUD7oQ="; + }; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X \"github.com/openrdap/rdap.version=OpenRDAP ${version}\"" ]; + + meta = with lib; { + homepage = "https://www.openrdap.org/"; + description = "Command line client for the Registration Data Access Protocol (RDAP)"; + license = licenses.mit; + maintainers = with maintainers; [ sebastianblunt ]; + }; +} 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 8c14352c05..31ff649e5f 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.13.2"; + version = "1.13.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "sha256-4lOEft1uiGN7OgFQzSn+QV8/wHl+W2yM3RAc5t8bUtk="; + sha256 = "sha256-0TKAchPDjB7YKJO2JqBwJPZITWXDQbjPbRN8amilJ6E="; }; - cargoSha256 = "sha256-NKq/lnpGrCLZjWdKquysoi25SsFtmtDrPIioDgQoMjw="; + cargoSha256 = "sha256-LBLUNBXsaGfviUUleoYIFf/vrbejKYwB9Lqetx3Agxc="; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix index b3e6ff4cb9..41eaf4a5f5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "sish"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vsW0zQczsYTTlvYkyvYMwYaIOu6JnXH3ZOwUgdeu+u0="; + sha256 = "sha256-0rUQRul6es+m8JFGXChrygwU5fBi6RiYhoD1dQHpG3s="; }; vendorSha256 = "sha256-GoiwpYELleD5tltQgRPGQU725h/uHe8tXqH4tIY//uE="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix index c52bdb0802..255455811a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { --replace /sbin/ifconfig ifconfig ''; + configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ + # musl doesn't have getprotobynumber_r + "sc_cv_getprotobynumber_r=2" + ]; + buildInputs = [ openssl readline ]; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix index e09a181d00..bc0c19f331 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20220101"; + version = "20220222"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = version; - sha256 = "sha256-3GW7WNUy7539dN2ckd/0PejzsiaCXcOIMR5FlZKBkMo="; + sha256 = "sha256-wSi8D82TOXZdUcfrvZJNd6oePvKWQepRW1r7A2fWApA="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix index 57a611664b..0c74fe4ad0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wg-netmanager"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "gin66"; repo = "wg_netmanager"; rev = "wg_netmanager-v${version}"; - sha256 = "sha256-2LO1OCGlkjdszwgNBZ+Qwp126VfDq3pxf0Gz+6kzuPI="; + sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M="; }; - cargoSha256 = "sha256-EM0TPMyWMVpLFhan0boAQoAvMHBVgXp6mnYJLHOHiV8="; + cargoSha256 = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s="; buildInputs = lib.optional stdenv.isDarwin Security; @@ -21,7 +21,12 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Wireguard network manager"; - longDescription = "Wireguard network manager, written in rust, simplifies the setup of wireguard nodes, identifies short connections between nodes residing in the same subnet, identifies unreachable aka dead nodes and maintains the routes between all nodes automatically. To achieve this, wireguard network manager needs to be running on each node."; + longDescription = '' + Wireguard network manager, written in rust, simplifies the setup of wireguard nodes, + identifies short connections between nodes residing in the same subnet, + identifies unreachable aka dead nodes and maintains the routes between all nodes automatically. + To achieve this, wireguard network manager needs to be running on each node. + ''; homepage = "https://github.com/gin66/wg_netmanager"; license = with licenses; [ mit asl20 bsd3 mpl20 ]; maintainers = with maintainers; [ gin66 ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix index 3d742a2a90..7e9e20dd3b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.11"; + version = "5.5.12"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-+fNld+stSniuQV2zx+Qd4s2ZSwNLmnve/tXg36MC2nM="; + sha256 = "sha256-UJy71VKEKPYfRXZB2lJiy6Ua6BkGW9Uz0zXciZC4oJE="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix index 6347a18c6f..ffc3483709 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "A2yUz2KhuRBoo5lMpZwPLNCJlYQXqsZSBR+Knj+gWAk="; + sha256 = "sha256-rr6cZ6tyrpCQyKcPBWwGsRAsLbjTXAoTtxf+u1UmvZo="; }; outputs = [ "bin" "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix index d1ad257568..e42a92e622 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.3.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-IQ+hv/R6uRPEPr7+SRXyYol4/cQo1ZqcqJxy26CpOoY="; + sha256 = "sha256-jhmNDzNICcXc0p+Esi+uWCL1wOkGDyrJGBa0IEnkE08="; }; - cargoSha256 = "sha256-PIqdjtqbSVQoxLj5jGSbrzRQ3qddZvp1Y7tIuFs7UEg="; + cargoSha256 = "sha256-4EtiF2W0J0OeguLDfjJbpHQKUZNtejxbTF1gNiP7SEQ="; passthru.tests = { version = testVersion { package = alejandra; }; diff --git a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix index 3d9d34aa7c..d25f51ae5a 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "statix"; - # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix + # also update version of the vim plugin in + # pkgs/applications/editors/vim/plugins/overrides.nix # the version can be found in flake.nix of the source code - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "nerdypepper"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw="; + sha256 = "sha256-9208bR3awxXR1MSh9HbsKeen5V4r4hPuJFkK/CMJRfg="; }; - cargoSha256 = "sha256-MKInDGBZcOp+90cus6X2GAgjZx6M1TbSJgpUQWx60sQ="; + cargoSha256 = "sha256-f1/PMbXUiqjFI8Y0mvgEyNqGGYqGq3nV094mg1aZIHM="; buildFeatures = lib.optional withJson "json"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 459f21756b..dc877ee2d8 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7wEwTw/CMKS9K377oXfGkJoRnAmBLjvZTNZzRMorWEM="; + sha256 = "sha256-KZeamXMhTX8CbPR66f4ij29GsIvzSbDUZtla+EXPRG4="; }; - vendorSha256 = "sha256-VzkfqIWkcMwQeGzisw7JBQyTNVz+m7wF6N65MtOFyEc="; + vendorSha256 = "sha256-j4ebzVOzlmQwSkP8epDGClT7fhSUtC6uWdcoo+tFbnc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index f7bb530480..e080a57dc6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -66,12 +66,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.7"; - suffix = "pre20220127_${lib.substring 0 7 src.rev}"; + suffix = "pre20220221_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c"; - sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4="; + rev = "caf51729450d4c57d48ddbef8e855e9bf65f8792"; + sha256 = "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw="; }; }); }) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix index e9db7f63fb..4e59333ed7 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix @@ -47,6 +47,9 @@ buildPythonApplication rec { hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; }) ]; + postPatch = '' + substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517" + ''; propagatedBuildInputs = [ blinker diff --git a/third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix b/third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix index 77f03e4174..f1d170e7d5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aiodnsbrute/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "aiodnsbrute"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "blark"; repo = pname; rev = "v${version}"; - sha256 = "0fs8544kx7vwvc97zpg4rs3lmvnb4vwika5g952rv3bfx4rv3bpg"; + sha256 = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE="; }; # https://github.com/blark/aiodnsbrute/pull/8 diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 40552d1490..ad75742576 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { icon = "bitwarden"; comment = "A secure and free password manager for all of your devices"; desktopName = "Bitwarden"; - categories = "Utility"; + categories = [ "Utility" ]; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix b/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix index 07df51e84e..22106727e3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "buttercup-desktop"; - version = "2.13.0"; + version = "2.14.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-JXXJZyd/fp2463WyxIB+pKcNzGUFfCouPE6iTx2lhME="; + sha256 = "sha256-ZZaolebDGqRk4BHP5PxFxBsMgOQAxUoIMTlhxM58k0Y="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix b/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix index 536a1a502a..8bf3e6983b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/certipy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "2.0"; + version = "2.0.9"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; rev = version; - hash = "sha256-xN0DrLrxWNCEy3HodA1pOJHYhDyA1sMRVIfefbXq45E="; + hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix index 8959d6627d..28c692b5c1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix @@ -3,38 +3,18 @@ , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - - # pycfmodel is pinned, https://github.com/Skyscanner/cfripper/issues/204 - pycfmodel = super.pycfmodel.overridePythonAttrs (oldAttrs: rec { - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "Skyscanner"; - repo = "pycfmodel"; - rev = version; - hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.3.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; + hash = "sha256-nomNjt/BV/Tu/9w4IEu3tXWQw4/wLTc64khdnQeliH0="; }; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ boto3 cfn-flip click @@ -45,7 +25,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = with py.pkgs; [ + checkInputs = with python3.pkgs; [ moto pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/dismap/default.nix b/third_party/nixpkgs/pkgs/tools/security/dismap/default.nix index c6dcd1051e..57f3795db8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dismap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dismap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dismap"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "zhzyker"; repo = pname; rev = "v${version}"; - sha256 = "0d5r6n92ndlr48f4z6lxwrx7bdh5mmibdjcyab4j2h49lf37c1qd"; + sha256 = "sha256-WaQdDcBvv4mHdPFAB+spC64YeT3jlfyMYNsTjBILjwA="; }; - vendorSha256 = "00hwhc86rj806arvqfhfarmxs1drcdp91xkr12whqhsi9ddc254d"; + vendorSha256 = "sha256-GnchyE2TswvjYlehhMYesZruTTwyTorfR+17K0RXXFY="; meta = with lib; { description = "Asset discovery and identification tools"; diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix index 9ba91d1865..d81e453f69 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; + sha256 = "sha256-8c9gDD/g5oP9GQV1ghb2UN9w5EccvxyDvJUAtgV8q7Y="; }; - vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; + vendorSha256 = "sha256-uvquc0bWwYzeeTuKlYaQp9r+O23MMs1Ajz1DPJ2qrnE="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix b/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix index 0ec07371df..5769e1a4b7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.5"; + version = "1.12.0"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-7pE4EnyV22qQ13RFKHv0ah/BQYHJE1jdTwXBeqpBFgs="; + sha256 = "sha256-i7oAmNjXkGn1MCn5EBmidMY/u3h/rzRAHCD4uhVGV/Q="; }; buildInputs = [ pam openssl zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index fc92019292..232e689d95 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-19"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-cHAvExbZqqLGPRsa578Po1G3uX2EIcx/visOB0RgNQc="; + sha256 = "sha256-EH4PlUb0PGUwkgfk1oFPKimoJcWI/mozzzaTST1De7A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/fprot/default.nix b/third_party/nixpkgs/pkgs/tools/security/fprot/default.nix deleted file mode 100644 index 6b930adcc2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/fprot/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - - pname = "f-prot"; - version = "6.2.1"; - - src = fetchurl { - url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; - sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; - }; - - installPhase = '' - mkdir -p $out/bin - cp fpscan $out/bin - - mkdir -p $out/opt/f-prot - cp fpupdate $out/opt/f-prot - cp product.data.default $out/opt/f-prot/product.data - cp license.key $out/opt/f-prot/ - cp f-prot.conf.default $out/opt/f-prot/f-prot.conf - ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate - - mkdir -p $out/share/man/ - mkdir -p $out/share/man/man1 - cp doc/man/fpscan.1 $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp doc/man/f-prot.conf.5 $out/share/man/man5 - mkdir -p $out/share/man/man8 - cp doc/man/fpupdate.8 $out/share/man/man8 - ''; - - meta = with lib; { - homepage = "http://www.f-prot.com"; - description = "A popular proprietary antivirus program"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix index 59dc202e69..8113289a9c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ="; + sha256 = "sha256-8op515+0wDxxU1e08gJ6lg/8NhQScFb4b3mCzBV/VNw="; }; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix index 831ec3b613..bb53a1958e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -34,7 +34,7 @@ let icon = "ghidra"; desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; - categories = "Development;"; + categories = [ "Development" ]; }; # postPatch scripts. diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix index e57f60637e..d65d7abc4d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/default.nix @@ -19,7 +19,7 @@ let icon = "ghidra"; desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index cb8155e5a1..ff70782dab 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.2.7"; + version = "8.3.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kCKkPx0JEzmQn0y6UbVuwZXre7rDd4vKTudh6J3AxYA="; + sha256 = "sha256-D6leHpGZNQ9Xt4PSU0Dwte6N3bMge7itkZtcUl0mIrQ="; }; - vendorSha256 = "sha256-zJ9Xl4tRUWntQwco+EHzqmL1aVcOjp70LCCmRsboxQ4="; + vendorSha256 = "sha256-JZOalUOIeV51Nttm6xeBos+/8fleSBpUiXa8ekVuYJA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix b/third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix index ecfc74cac5..a098933784 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gomapenum/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gomapenum"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nodauf"; repo = "GoMapEnum"; rev = "v${version}"; - sha256 = "sha256-AjHqD9r4ZU5NCqXEovvQuV4eeMLBy2jO/uqZQiCTyNI="; + sha256 = "sha256-a0JpHk5pUe+MkcmJl871JwkOfFDg3S4yOzFIeXCReLE="; }; - vendorSha256 = "sha256-65NF814w1IUgSDuLLIqfbsf22va4AUC2E05ZgmuOHGY="; + vendorSha256 = "sha256-5C0dDY/42H8oHNdQaKYiuqpi2QqqgHC7VMO/0kFAofY="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index 30206fab0e..cc35a24151 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts="; + sha256 = "sha256-5QjyGIpxnrwTnEmi0D16vPKodg3+SKiINFONwU2OzC0="; # 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; @@ -27,7 +27,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y="; + vendorSha256 = "sha256-CPMfQv9oiLbIMkZe/t482LzssoNTcNVJdr2o2wJecSA="; 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 1e57679b4a..0d87780cee 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.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-XA099gBp52g0RUbbFSE8uFa7gh56bO8H66KaFAtK1RU="; + sha256 = "sha256-zNK/OBDo6cL0uZHosulusdOviYZMD2TCusE+0Mn330g="; }; - vendorSha256 = "sha256-Qx0QaPKpEq4U+G3qdfMN4EVyY5zI2SyzcK/U6o6loHE="; + vendorSha256 = "sha256-a6Tpz4jPQbtiWt6OyDKy+xbRx6EBwADyqTkvBnyusdQ="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix index eae06ea649..e5b805b89c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-5meBBBijX49EQc9VejySwiIKsyCBEKGKIXvH7en6XuU="; + hash = "sha256-z8u6j6YLBHmgZKSGh/rFDDSnWZrBgWsqfKP3vhaukbY="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-t+CkjoZqWqphxbg/4E3/7U8nKoV0AlITyRScLN8x6yY="; + outputHash = "sha256-kiNtA63sINX7VRsq4JKAiZYzymHe1TrNetZsE6S9KVM="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix index 046abed36f..4e7a623740 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix @@ -62,9 +62,9 @@ let comment = "Java Decompiler JD-GUI"; desktopName = "JD-GUI"; genericName = "Java Decompiler"; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development;Debugger;"; - extraEntries="StartupWMClass=org-jd-gui-App"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" "Debugger" ]; + startupWMClass = "org-jd-gui-App"; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix index 5b4a2cbc33..d9b708bc38 100644 --- a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = version; - hash = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o="; + hash = "sha256-aM78If4/zW/0CqVjZHDbHrrWDuU1VSVhX7dfy9FR098="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/krunner-pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/krunner-pass/default.nix index 7904235b86..a9f2c241d2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/krunner-pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/krunner-pass/default.nix @@ -1,9 +1,17 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules -, kauth, krunner -, pass, pass-otp ? null }: +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kauth +, krunner +, pass +}: mkDerivation rec { pname = "krunner-pass"; + # when upgrading the version, check if cmakeFlags is still needed version = "1.3.0"; src = fetchFromGitHub { @@ -13,9 +21,10 @@ mkDerivation rec { sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0"; }; - buildInputs = [ - kauth krunner - pass pass-otp + buildInputs = [ + kauth + krunner + (pass.withExtensions (p: with p; [ pass-otp ])) ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -33,6 +42,9 @@ mkDerivation rec { ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' ]; + # there are *lots* of pointless warnings in v1.3.0 + cmakeFlags = [ "-Wno-dev" ]; + meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; homepage = "https://github.com/akermu/krunner-pass"; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index d418842421..ca0b1305d0 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.0.147"; + version = "2.0.148"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-5ESAvLCAQ6ttpuc3YGkUwUvvhHZj+QYXyx30fhVSP1Y="; + hash = "sha256-Wn/yVGAAdAaIsHUDWWqVyAlOTYIXpbwIktX9h4LN+fQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix b/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix index 65512eb8be..4ba294e42f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix @@ -2,6 +2,7 @@ , autoreconfHook, bison, flex, pkg-config , curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre , ssdeep, valgrind, yajl +, nixosTests }: stdenv.mkDerivation rec { @@ -50,6 +51,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + nginx-modsecurity = nixosTests.nginx-modsecurity; + }; + meta = with lib; { homepage = "https://github.com/SpiderLabs/ModSecurity"; description = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix b/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix index 0bc08fb6e3..d894e39d7f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "log4j-sniffer"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "palantir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NojFXonov/80p+6kimfbiMK/v4najiMe//xFDnOi5KE="; + sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index eb6e90ac77..aff1c8c625 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.30" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.31" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 5711b8756e..64f7ec00c2 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: aab66244adaadb275bd780c1301fea51f444426a - ref: refs/tags/6.1.30 + revision: 2bed5461f9e43e2608a90c3331045b62e8dba26a + ref: refs/tags/6.1.31 specs: - metasploit-framework (6.1.30) + metasploit-framework (6.1.31) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.74) + metasploit-payloads (= 2.0.75) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -128,23 +128,23 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.555.0) - aws-sdk-core (3.126.2) + aws-partitions (1.559.0) + aws-sdk-core (3.127.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.299.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ec2 (1.300.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-iam (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.74) + metasploit-payloads (2.0.75) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -264,7 +264,7 @@ GEM webrick metasploit_payloads-mettle (1.0.18) method_source (1.0.0) - mini_portile2 (2.7.1) + mini_portile2 (2.8.0) minitest (5.15.0) mqtt (0.5.0) msgpack (1.4.5) @@ -278,8 +278,8 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) octokit (4.22.0) @@ -292,13 +292,13 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.9.1) + pdf-reader (2.9.2) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.2) + pg (1.3.3) public_suffix (4.0.6) puma (5.6.2) nio4r (~> 2.0) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index dcaeafc428..e7f20acf8a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.30"; + version = "6.1.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-QSKJIcHaWsxbHe2uTW5MnZFMoK1fOa6TejIT2Mq0z7k="; + sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw="; }; 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 531b0b6c24..ced2ecf9bc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r3ihnddcizpf34mcfggyjii8lmjyy1q89mswpbzqa5mxvws85qg"; + sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw"; type = "gem"; }; - version = "1.555.0"; + version = "1.559.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v"; + sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq"; type = "gem"; }; - version = "3.126.2"; + version = "3.127.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13kl993psm21mni2g3llyj6b1nzway8kcabnrblnrjkd4d4fg3v7"; + sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd"; type = "gem"; }; - version = "1.299.0"; + version = "1.300.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iv8db2wb3lajcnqx6icn7bdvhrfd7di01c329r95kgw6gzsf7sc"; + sha256 = "15rhfl5g49422g8bi90dv0cx3imbza99223pqdi4vsg6gwzhszhy"; type = "gem"; }; - version = "1.67.0"; + version = "1.68.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2"; + sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; type = "gem"; }; - version = "1.54.0"; + version = "1.55.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5"; + sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; type = "gem"; }; - version = "1.112.0"; + version = "1.113.0"; }; aws-sigv4 = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "aab66244adaadb275bd780c1301fea51f444426a"; - sha256 = "1ffgnk5dh4rjga9swfazmnh4r4cx9ip4vbpd3mdwqnnsq4hqj8j1"; + rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a"; + sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.30"; + version = "6.1.31"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03q70mqn38chhm9cmjh6k4ch5jsrgf2id09jv0ylkn3vsrrjfzpg"; + sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z"; type = "gem"; }; - version = "2.0.74"; + version = "2.0.75"; }; metasploit_data_models = { groups = ["default"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; minitest = { groups = ["default"]; @@ -877,10 +877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.13.1"; + version = "1.13.3"; }; nori = { groups = ["default"]; @@ -967,20 +967,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pn5l3ayjfn4mv2079q80q0x3q39q25nxcc5l9cjqz4lf5anhlfi"; + sha256 = "1pmb0lhbch06i8br2nkcq3flbfx1s2wqi3vkndqr4vnx3azvyjf6"; type = "gem"; }; - version = "2.9.1"; + version = "2.9.2"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35"; + sha256 = "0qqky1q9xhji017q1apx9w81qdlwpm6ix3amhikjy416hxxmhcj1"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; public_suffix = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix index ec7b0e976e..b09a37a238 100644 --- a/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-certgen"; - version = "0.0.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "minio"; repo = "certgen"; rev = "v${version}"; - sha256 = "sha256-HtzcoEUMt3LpQNyT0wGcmc4Q70QqHx7QpjrDh4YSO/Q="; + sha256 = "sha256-YLFrW0w1H6u/lTP4fWPcRFTG9gIm228J2KcE4VSeG2Q="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 91dba36e33..0b3e21b73d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.0"; + version = "2.6.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NTqpj97M61hJP44gr0mRIOI0Syw3oSQeH0ooNHkLgSE="; + sha256 = "sha256-4jByNyO0EvJ2ppdg21+7YfeB9arjBZALrOm5MJlkZsg="; }; - vendorSha256 = "sha256-/mucUSk8+uAD+lIIKtt9+iNZKE4Y12a7GI6PHlnaPAQ="; + vendorSha256 = "sha256-717+jJiyqmctR9Yb/XnnKd1N+31K2+xO1XClGMKlL+k="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix index 470e5f6530..e7e21aec7c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { comment = "Client side implementation of the eCard-API-Framework"; icon = "oec_logo_bg-transparent.svg"; exec = pname; - categories = "Utility;Security;"; + categories = [ "Utility" "Security" ]; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix index afe1d03fff..0cc3f9bcf0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pinentry-bemenu"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "t-8ch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AFS4T7VqPga53/3rG8be9Q//6/2JJIe7+Ata33ewySg="; + sha256 = "sha256-2Q8hN7AbuGqm7pfNHlJlSi1Op/OpJBun/AIDhUDnGvU="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix new file mode 100644 index 0000000000..7dc7e3a7a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/pomerium-cli/default.nix @@ -0,0 +1,58 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, pomerium +}: + +let + inherit (lib) concatStringsSep concatMap id mapAttrsToList; +in +buildGoModule rec { + pname = "pomerium-cli"; + version = pomerium.version; + src = fetchFromGitHub { + owner = "pomerium"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1"; + }; + + vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b"; + subPackages = [ + "cmd/pomerium-cli" + ]; + + ldflags = let + # Set a variety of useful meta variables for stamping the build with. + setVars = { + "github.com/pomerium/cli/version" = { + Version = "v${version}"; + BuildMeta = "nixpkgs"; + ProjectName = "pomerium-cli"; + ProjectURL = "github.com/pomerium/cli"; + }; + }; + concatStringsSpace = list: concatStringsSep " " list; + mapAttrsToFlatList = fn: list: concatMap id (mapAttrsToList fn list); + varFlags = concatStringsSpace ( + mapAttrsToFlatList (package: packageVars: + mapAttrsToList (variable: value: + "-X ${package}.${variable}=${value}" + ) packageVars + ) setVars); + in [ + "${varFlags}" + ]; + + installPhase = '' + install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli + ''; + + meta = with lib; { + homepage = "https://pomerium.io"; + description = "Client-side helper for Pomerium authenticating reverse proxy"; + license = licenses.asl20; + maintainers = with maintainers; [ lukegb ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix b/third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix index c3141676b3..44ccd79fd3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pwgen-secure/default.nix @@ -1,7 +1,9 @@ { lib, python3Packages, fetchFromGitHub }: -with python3Packages; +let + inherit (python3Packages) buildPythonApplication pythonOlder; +in buildPythonApplication rec { pname = "pwgen-secure"; version = "0.9.1"; @@ -18,10 +20,18 @@ buildPythonApplication rec { sha256 = "15md5606hzy1xfhj2lxmc0nvynyrcs4vxa5jdi34kfm31rdklj28"; }; - propagatedBuildInputs = [ docopt ]; + postPatch = '' + shareDir=$out/share/${pname} + + substituteInPlace pwgen_secure/rpg.py \ + --replace "os.path.join(path, 'words.txt')" "os.path.join('$shareDir', 'words.txt')" + ''; + + propagatedBuildInputs = with python3Packages; [ docopt ]; postInstall = '' - install -Dm755 spwgen.py $out/bin/spwgen + install -Dm555 spwgen.py $out/bin/spwgen + install -Dm444 pwgen_secure/words.txt -t $shareDir ''; # there are no checks @@ -32,5 +42,6 @@ buildPythonApplication rec { homepage = "https://github.com/mjmunger/pwgen_secure/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "spwgen"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/scallion/default.nix b/third_party/nixpkgs/pkgs/tools/security/scallion/default.nix deleted file mode 100644 index 6f0dcd1bb0..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/scallion/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: - -stdenv.mkDerivation rec { - version = "2.1"; - pname = "scallion"; - - src = fetchFromGitHub { - owner = "lachesis"; - repo = "scallion"; - rev = "v${version}"; - sha256 = "1l9aj101xpsaaa6kmmhmq68m6z8gzli1iaaf8xaxbivq0i7vka9k"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ mono ]; - - buildPhase = '' - xbuild scallion.sln - ''; - - installPhase = '' - mkdir -p $out/share - cp scallion/bin/Debug/* $out/share/ - makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ - --add-flags $out/share/scallion.exe - ''; - - meta = with lib; { - description = "GPU-based tor hidden service name generator"; - homepage = src.meta.homepage; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ volth ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix index a865e441f1..35ce8e900f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xZBK2gIIxuvO2fuSYyWitO1xT8ItfBVqt2JRJoyH+gg="; + sha256 = "sha256-QOWQhuEEnwtHmQwl5WCCHcKMjwhgxn9xerR0Bxi3660="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -27,7 +27,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-NSV7mDn1efQAO4jm6bJm12ExDFTN76TkmD4r61V6D2Q="; + vendorSha256 = "sha256-AFadBzkRj0D1MXLHzexvomJ0cqirhW82tnNRGx/gChI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -48,6 +48,8 @@ buildGoModule rec { getGoDirs() { go list ./... | grep -v e2e } + # Ensure other e2e tests that have escaped the e2e dir dont run + export SKIP_GINKGO=1 ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/signify/default.nix b/third_party/nixpkgs/pkgs/tools/security/signify/default.nix index fb3df51167..3ac6f58dce 100644 --- a/third_party/nixpkgs/pkgs/tools/security/signify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/signify/default.nix @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd ]; - preInstall = '' - export PREFIX=$out + postPatch = '' + substituteInPlace Makefile --replace "shell pkg-config" "shell $PKG_CONFIG" ''; + installFlags = [ "PREFIX=$(out)" ]; + meta = with lib; { description = "OpenBSD signing tool"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix index 1c9dfc3610..0885c1d2de 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-ROdi1pU2VeswmItHOSZimOkPYlgdqEMg2b7zt0f9WrM="; + sha256 = "sha256-lFb+W2PSmXzzNhG+yNmnDNqtUc0TsDYYnsBnKdsiPSo="; }; buildInputs = [ openssl ]; 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 e91a35b808..0f8f37a489 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.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gMJFzfqQsxOXPRdRj48c3FKhXsPLEmegiENa2OHWEGo="; + sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-wnMQPnL8M57BOY9QmawLpqtWv+n3GdfIadJ3PwuicOU="; + vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; 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/tboot/default.nix b/third_party/nixpkgs/pkgs/tools/security/tboot/default.nix index d11426a2b4..a33c26419e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tboot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tboot"; - version = "1.10.3"; + version = "1.10.4"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "sha256-ixFs9Bd6VNT1n5RU6n38hFR+m4+SBNzwrCNXRmCHgOQ="; + sha256 = "sha256-iEn6mZ0tuDBA1a2POpJEBaIM0TMVDohbVvp/6OO4nAY="; }; buildInputs = [ openssl trousers zlib ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index ea431f7272..b9da8e95d3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terrascan"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GIonoedad/ruKN8DaFfFdW4l3ZWIM1NI5DtgBYPw+38="; + sha256 = "sha256-ja7Cpd+BegGdKOWAiH5JsniO4NYlFEgJzqBuNzE2ao4="; }; vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo="; diff --git a/third_party/nixpkgs/pkgs/tools/security/witness/default.nix b/third_party/nixpkgs/pkgs/tools/security/witness/default.nix index 571685afb4..bb15d9d72c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/witness/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/witness/default.nix @@ -1,25 +1,57 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "witness"; - version = "0.1.1"; + version = "0.1.6"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NnDsiDUTCdjsHVA/mHnB8WRnvwFTzETkWUOd7IgMIWE="; + sha256 = "sha256-/35hIA6Wm/F5hwyLZbt4JXpwWISWbzVAWrX29r6pejY="; }; - vendorSha256 = "sha256-zkLparWJsuqrhOQxxV37dBqt6fwpSinTO+paJkbl+sM="; + vendorSha256 = "sha256-vXDsHHJknw9hsHx1mJA2c0CWwFbRXjCjitNWPh6V4yw="; + + nativeBuildInputs = [ installShellFiles ]; # We only want the witness binary, not the helper utilities for generating docs. subPackages = [ "cmd/witness" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}" + ]; + + # Feed in all tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + preCheck = '' + unset subPackages + ''; + + postInstall = '' + installShellCompletion --cmd witness \ + --bash <($out/bin/witness completion bash) \ + --fish <($out/bin/witness completion fish) \ + --zsh <($out/bin/witness completion zsh) + ''; + meta = with lib; { description = "A pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target"; + longDescription = '' + Witness prevents tampering of build materials and verifies the integrity + of the build process from source to target. It works by wrapping commands + executed in a continuous integration process. Its attestation system is + pluggable and offers support out of the box for most major CI and + infrastructure providers. Verification of Witness metadata and a secure + PKI distribution system will mitigate against many software supply chain + attack vectors and can be used as a framework for automated governance. + ''; homepage = "https://github.com/testifysec/witness"; + changelog = "https://github.com/testifysec/witness/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ fkautz ]; + maintainers = with maintainers; [ fkautz jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix index a0a06e2906..082f163437 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix @@ -14,23 +14,31 @@ }: stdenv.mkDerivation rec { - version = "4.1.3"; pname = "yara"; + version = "4.2.0-rc1"; src = fetchFromGitHub { owner = "VirusTotal"; - repo = "yara"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-7t2KksI3l+wFHqUSw2L4FXepMTJfTow/cTFYA47YBqY="; + hash = "sha256-WcN6ClYO2d+/MdG06RHx3kN0o0WVAY876dJiG7CwJ8w="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ pcre protobufc ] - ++ lib.optionals withCrypto [ openssl ] - ++ lib.optionals enableMagic [ file ] - ++ lib.optionals enableCuckoo [ jansson ] - ; + buildInputs = [ + pcre + protobufc + ] ++ lib.optionals withCrypto [ + openssl + ] ++ lib.optionals enableMagic [ + file + ] ++ lib.optionals enableCuckoo [ + jansson + ]; preConfigure = "./bootstrap.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix index c7db9e363f..d3d982da4d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.3"; - hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8="; + version = "1.2.4"; + hash = "sha256-IFuDpqRtsim2dfSTODuNK62xaLvKKcB5YBNHSQI6q44="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix index 7a16c5ab59..5d09020eec 100644 --- a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.27.2"; + version = "0.28.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-Uqb0HXaYHGcW7lkUNLa2oXM0gu+SWwpv+NdPnOO87cs="; + sha256 = "sha256-9NsudhalFm0km7BmK+2QzK9LxirrVtIFzNrugpw4f8g="; }; - vendorSha256 = "sha256-my4ECzmvrPhbKlcEptQ0xi4lYxHm42IrEsOvcetuMeQ="; + vendorSha256 = "sha256-SUbQPzFZUBgFZvaLc8730hZhJvt3/ni306Vt3EZMOmU="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix index 43aa2b10cc..7c4002b8a9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,36 +5,45 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.48"; + version = "3.5.49"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "sha256-woANhwLOhvTnq+Bnc8zCIDZEJOv3swNfeI/3nQ7Y1SM="; + hash = "sha256-gcScF5LIqWVBv8erI3hG5tt5BZPO2XlhFACz1Y60+v4="; }; buildInputs = [ jdk ]; nativeBuildInputs = [ ant cunit ncurses ]; buildPhase = '' + runHook preBuild + export ANT_HOME=${ant} export JAVA_HOME=${jdk}/lib/openjdk/jre/ export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} cp bin/wrapper $out/bin/wrapper cp lib/wrapper.jar $out/lib/wrapper.jar cp lib/libwrapper.so $out/lib/libwrapper.so + + runHook postInstall ''; meta = with lib; { description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; homepage = "https://wrapper.tanukisoftware.com/"; - license = licenses.gpl2; + changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}"; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.suhr ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix index 97d920ce91..f0ce083833 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook , mailutils ? null , aclSupport ? true, acl +, nixosTests }: stdenv.mkDerivation rec { @@ -25,6 +26,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ]; + passthru.tests = { + nixos-logrotate = nixosTests.logrotate; + }; + meta = with lib; { homepage = "https://github.com/logrotate/logrotate"; description = "Rotates and compresses system logs"; diff --git a/third_party/nixpkgs/pkgs/tools/system/lr/default.nix b/third_party/nixpkgs/pkgs/tools/system/lr/default.nix index 43d37569ba..2bb49bf980 100644 --- a/third_party/nixpkgs/pkgs/tools/system/lr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/lr/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "List files recursively"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ vika_nezrimaya ]; + maintainers = with maintainers; [ vikanezrimaya ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix index 96c1c91591..0f116c0461 100644 --- a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.30.0"; + version = "5.31.0"; src = fetchurl { url = "${meta.homepage}dist/monit-${version}.tar.gz"; - sha256 = "sha256-6FZJ36hYb0/N00oClcVd3Wmw7abPvaxHEFomc9ELEAg="; + sha256 = "sha256-6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU="; }; nativeBuildInputs = [ bison flex ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 79f829ffdf..d1e3065efd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, protobuf , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; - buildInputs = [ curl.dev zlib.dev ] + buildInputs = [ curl.dev zlib.dev protobuf ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] ++ optionals withCups [ cups ] @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + # This is only needed for 1.33.1, remove on the next release + ./fix-protobuf.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/fix-protobuf.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/fix-protobuf.patch new file mode 100644 index 0000000000..963e307ec7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/fix-protobuf.patch @@ -0,0 +1,23 @@ +diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c +index b64a78f29..ccd1c884d 100644 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -60,7 +60,6 @@ + // Optional libraries + + #ifdef HAVE_PROTOBUF +-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE) + #define FEAT_PROTOBUF 1 + #ifdef BUNDLED_PROTOBUF + #define FEAT_PROTOBUF_BUNDLED " (bundled)" +@@ -71,10 +70,6 @@ + #define FEAT_PROTOBUF 0 + #define FEAT_PROTOBUF_BUNDLED "" + #endif +-#else +-#define FEAT_PROTOBUF 0 +-#define FEAT_PROTOBUF_BUNDLED "" +-#endif + + #ifdef ENABLE_JSONC + #define FEAT_JSONC 1 diff --git a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix index d01b08a143..02a214259c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "pcstat-unstable"; - version = "2017-05-28"; - - goPackagePath = "github.com/tobert/pcstat"; +buildGoModule rec { + pname = "pcstat"; + version = "0.0.1"; src = fetchFromGitHub { - rev = "91a7346e5b462a61e876c0574cb1ba331a6a5ac5"; - owner = "tobert"; - repo = "pcstat"; - sha256 = "88853e42d16c05e580af4fb8aa815a84ea0fc43e3a25e19c85e649a5f5a2874c"; + owner = "tobert"; + repo = "pcstat"; + rev = "v${version}"; + sha256 = "sha256-rN6oqhvrzMBhwNLm8+r4rZWZYZUhOq2h764KVhSycNo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-1y6rzarkFNX8G4E9FzCLfWxULbdNYK3DeelNCJ+7Y9Q="; meta = with lib; { description = "Page Cache stat: get page cache stats for files on Linux"; diff --git a/third_party/nixpkgs/pkgs/tools/system/pcstat/deps.nix b/third_party/nixpkgs/pkgs/tools/system/pcstat/deps.nix deleted file mode 100644 index 809bde1122..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/pcstat/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac"; - sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix index d0a22203aa..5d7fd2b1b6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.34.1"; + version = "3.35.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-zs457BxoyI1JNwXgpSi4PQONo4TonUg4OTzMdfYqLUw="; + sha256 = "sha256-HQI4sGs+WYfIWeW1Kezuc491us/wSxSTmLH+jLsSHlM="; }; nativeBuildInputs = [ pkg-config which ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.syslog-ng.com"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index eb1e8ab5a3..f2fae161da 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--disable-werror" ]; preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix index 27c2a1ff28..5cfa00d532 100644 --- a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "asciigraph"; - version = "0.5.2"; + version = "0.5.3"; goPackagePath = "github.com/guptarohit/asciigraph"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iVgJtxt0B6nMA3bieZ1CmZucwLMb5av6Wn5BMDRWfcI="; + sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix b/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix index a77a5dc081..85d78ffb73 100644 --- a/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/diffr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.4"; + version = "0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "05rfjangmyvmqm0bvl4bcvc7m4zhg66gknh85sxr3bzrlwzacwgw"; + cargoSha256 = "0pn3vqv13n29h8069a38306vjlzlxf1m08ldv7lpzgqxhl8an00r"; buildInputs = (lib.optional stdenv.isDarwin Security); diff --git a/third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix index e0385d3324..3577242fc0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/dirdiff/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Dirdiff"; genericName = "Directory Diff Viewer"; comment = "Diff and merge directory trees"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index d66d3763c0..3f91a301fd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { - pname = "gawk"; + pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.1.1"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix b/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix index 5472c8a36c..f6c70013b4 100644 --- a/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/hottext/default.nix @@ -19,7 +19,7 @@ nimPackages.buildNimPackage rec { HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; desktopItem = makeDesktopItem { - categories = "Utility;"; + categories = [ "Utility" ]; comment = meta.description; desktopName = pname; exec = pname; diff --git a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix new file mode 100644 index 0000000000..5a05501f1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, Security +, testVersion +, igrep +}: + +rustPlatform.buildRustPackage rec { + pname = "igrep"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "konradsz"; + repo = "igrep"; + rev = "v${version}"; + sha256 = "sha256-ZbJogp4rTc3GAD71iQUIf5EqwJ8XD9/WmvdAcGIgcvY="; + }; + + cargoSha256 = "sha256-sj2GEyUPq9+JXlGpKYRNfhfwGf5F/J46AoOjUu4xm7I="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + passthru.tests = { + version = testVersion { package = igrep; command = "ig --version"; }; + }; + + meta = with lib; { + description = "Interactive Grep"; + homepage = "https://github.com/konradsz/igrep"; + license = licenses.mit; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index 5e4bd7becc..9c7f4e2b38 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "6.7"; + version = "8.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-ZPKYZbWrR69V4SkXTiAK59Q2xpxkOC6KyAuspjzERwQ="; + sha256 = "sha256-1cJt/+OClc7YxSy9kGLQrREckjDvMIBdzet9SJGPb84="; }; - vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8="; + vendorSha256 = "sha256-a+pWSt24+aNABcLhiiFy+g/imBQtiqliAAWWkjPolxU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile b/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile new file mode 100644 index 0000000000..84e6742401 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pru' diff --git a/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile.lock new file mode 100644 index 0000000000..98a00ad536 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pru/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + pru (0.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + pru + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/tools/text/pru/default.nix b/third_party/nixpkgs/pkgs/tools/text/pru/default.nix new file mode 100644 index 0000000000..26e7434424 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pru/default.nix @@ -0,0 +1,24 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp rec { + pname = "pru"; + gemdir = ./.; + exes = [ "pru" ]; + + meta = with lib; { + homepage = "https://github.com/grosser/pru"; + description = "Pipeable Ruby"; + longDescription = '' + pru allows to use Ruby scripts as filters, working as a convenient, + higher-level replacement of typical text processing tools (like sed, awk, + grep etc.). + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; + + passthru.updateScript = bundlerUpdateScript pname; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/pru/gemset.nix b/third_party/nixpkgs/pkgs/tools/text/pru/gemset.nix new file mode 100644 index 0000000000..76d469ef1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pru/gemset.nix @@ -0,0 +1,12 @@ +{ + pru = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1imavf7wlbdfxvkrf838pp3cyfib0r7nzv0chnhyxagy1kk969r2"; + type = "gem"; + }; + version = "0.2.1"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/recode/default.nix b/third_party/nixpkgs/pkgs/tools/text/recode/default.nix index ce377fada9..8c49fb5ee7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/recode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/recode/default.nix @@ -2,24 +2,27 @@ stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.9"; + version = "3.7.12"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-5DIKaw9c2DfNtFT7WFQBjd+pcJEWCOHwHMLGX2M2csQ="; + hash = "sha256-TbHJB28E26oVlyb1AAhH5eWoOuyOXGT4ygQ4P2zaEtU="; }; nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; buildInputs = [ libintl ]; + enableParallelBuilding = true; + doCheck = true; meta = { homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; + changelog = "https://github.com/rrthomas/recode/raw/v${version}/NEWS"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix b/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix index 4f70f972b6..a4edf55f75 100644 --- a/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/rosie/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchgit , libbsd , readline @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "rosie"; version = "unstable-2020-01-11"; + src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 4ed12b5b13..91ac9ae2e1 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.15.1"; + version = "2.15.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; + sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8="; }; vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 92fde60c23..4d6d23054d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; - categories = "Development;Utility;Database"; - mimeType = "text/xml"; + categories = [ "Development" "Utility" "Database" ]; + mimeTypes = [ "text/xml" ]; }); dontBuild = true; 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 f535449daf..f1ab390e48 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.2"; + version = "8.3"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-ANs8xod8iFv81ACZM859Qn1HIVbyUConyha8rwH6rmQ="; + sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw="; }; buildInputs = [curl libiconv]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 0618a55df4..be7f978a42 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,7 +147,9 @@ let in stdenv.mkDerivation rec { - pname = "asciidoc"; + pname = "asciidoc" + + lib.optionalString enableStandardFeatures "-full" + + lib.optionalString enableExtraPlugins "-with-plugins"; version = "9.1.0"; # Note: a substitution to improve reproducibility should be updated once 10.0.0 is diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix index 6b64ee4660..f1568de60e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2odt/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, makeWrapper, fetchFromGitHub -, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }: +{ lib +, resholvePackage +, fetchFromGitHub +, bc +, coreutils +, file +, gawk +, ghostscript +, gnused +, imagemagick +, zip +, bash +, findutils +}: -let - path = lib.makeBinPath [ - bc - coreutils - file - gawk - ghostscript - gnused - imagemagick - zip - ]; - -in stdenv.mkDerivation rec { +resholvePackage rec { pname = "pdf2odt"; version = "20170207"; @@ -24,8 +24,6 @@ in stdenv.mkDerivation rec { sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; }; - nativeBuildInputs = [ makeWrapper ]; - patches = [ ./use_mktemp.patch ]; installPhase = '' @@ -33,10 +31,24 @@ in stdenv.mkDerivation rec { install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods - - wrapProgram $out/bin/pdf2odt \ - --prefix PATH : ${path} ''; + solutions = { + default = { + scripts = [ "bin/pdf2odt" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + bc + file + imagemagick + gawk + gnused + ghostscript + zip + findutils + ]; + }; + }; meta = with lib; { description = "PDF to ODT format converter"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index bfd0bfb64b..4b4ec194a9 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; + sha256 = "sha256-Xw/Rs30mH81b8qqdpmbXjSSYIG08wwRvykzhPpF94uk="; }; - cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; + cargoSha256 = "sha256-JzYCxsaBuQ5I+FgHVRQPNM32bJlE4H9Fd+48/jXDcr0="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -40,6 +40,8 @@ rustPlatform.buildRustPackage rec { --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ + + ln -s $out/bin/tectonic $out/bin/nextonic ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix index 99ef9a8a71..5ccc9ed156 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -14,7 +14,7 @@ # enable any extra features. stdenv.mkDerivation rec { - pname = "dblatex"; + pname = "dblatex${lib.optionalString enableAllFeatures "-full"}"; version = "0.3.12"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix index b094e22303..469f76fdc2 100644 --- a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "sha256-kmFyJ5b0EiesWUN71rbULF2cQt2pICF0P/MeZ+h7W9U="; + sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk="; }; nativeBuildInputs = [ cmake nasm ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index eaaf7046ff..734ba58e69 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,65 +1,57 @@ -{ lib, python3, glibcLocales }: +{ lib, python3, glibcLocales, docker-compose }: let + docker_compose = changeVersion (with localPython.pkgs; docker-compose.override { + inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; + }).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; - localPython = python3.override { - packageOverrides = self: super: { - cement = super.cement.overridePythonAttrs (oldAttrs: rec { - version = "2.8.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - }; - }); - - colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { - version = "0.3.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; - }; - }); - - pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "0.5.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; - }; - }); - - requests = super.requests.overridePythonAttrs (oldAttrs: rec { - version = "2.9.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"; - }; - }); - - semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { - version = "2.5.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv"; - }; - }); - - tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec { - version = "0.7.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch"; - }; - }); + changeVersion = overrideFunc: version: sha256: overrideFunc (oldAttrs: rec { + inherit version; + src = oldAttrs.src.override { + inherit version sha256; }; - }; -in with localPython.pkgs; buildPythonApplication rec { + }); + + changeVersionHash = overrideFunc: version: hash: overrideFunc (oldAttrs: rec { + inherit version; + src = oldAttrs.src.override { + inherit version hash; + }; + }); + + localPython = python3.override + { + self = localPython; + packageOverrides = self: super: { + cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; + botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs="; + colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; + future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; + requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3"; + wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.4.1"; + checkPhase = '' + runHook preCheck + PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all + runHook postCheck + ''; + src = localPython.pkgs.fetchPypi { + pname = "PyYAML"; + inherit version; + sha256 = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; + }; + }); + }; + }; +in +with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.12.4"; + version = "3.20.3"; src = fetchPypi { inherit pname version; - sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6"; + sha256 = "sha256-W3nUXPAXoicDQNXigktR1+b/9W6qvi90fujrXAekxTU="; }; buildInputs = [ @@ -69,29 +61,38 @@ in with localPython.pkgs; buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ - pytest mock nose pathspec colorama requests docutils + pytest + mock + nose + pathspec + colorama + requests + docutils ]; - doCheck = false; + doCheck = true; propagatedBuildInputs = [ - # FIXME: Add optional docker dependency, which requires requests >= 2.14.2. - # Otherwise, awsebcli will try to install it using pip when using some - # commands (like "eb local run"). - blessed botocore cement colorama dockerpty docopt pathspec pyyaml - requests semantic-version setuptools tabulate termcolor websocket-client + blessed + botocore + cement + colorama + pathspec + pyyaml + future + requests + semantic-version + setuptools + tabulate + termcolor + websocket-client + docker_compose ]; - postInstall = '' - mkdir -p $out/share/bash-completion/completions - mv $out/bin/eb_completion.bash $out/share/bash-completion/completions/ - ''; - meta = with lib; { homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 7407c3dc68..dfdde2ead9 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.44"; + version = "0.3.47"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o="; + sha256 = "sha256-hzycO6yAwOoanoxxaGW0EwFiclu0WMkepzUAa6Zf8fg="; }; vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix index fd4db1a934..555e40384c 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wluma/default.nix @@ -24,25 +24,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkg-config + rustPlatform.bindgenHook ]; buildInputs = [ udev - v4l-utils.lib + v4l-utils ]; - LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - - # Works around the issue with rust-bindgen and the Nix gcc wrapper: - # https://hoverbear.org/blog/rust-bindgen-in-nix/ - preBuild = '' - export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - -isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include \ - -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include \ - -idirafter ${v4l-utils.dev}/include" - ''; - postInstall = '' wrapProgram $out/bin/wluma \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index b1de098775..02bc197f92 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -35,6 +35,9 @@ in ### Please maintain this list in ASCIIbetical ordering. ### Hint: the "sections" are delimited by ### ### +# A script to convert old aliases to throws and remove old +# throws can be found in './maintainers/scripts/remove-old-aliases.py'. + mapAliases ({ # forceSystem should not be used directly in Nixpkgs. # Added 2018-07-16 @@ -45,12 +48,12 @@ mapAliases ({ ### A ### - accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19 - adobeReader = adobe-reader; # Added 2013-11-04 - adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01 + accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 + adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 + adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 - ag = silver-searcher; # Added 2018-04-25 - aircrackng = aircrack-ng; # Added 2016-01-14 + ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 + aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30 alienfx = throw "alienfx has been removed."; # Added 2019-12-08 @@ -62,19 +65,21 @@ mapAliases ({ alsaUtils = alsa-utils; # Added 2021-06-10 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 - ammonite-repl = ammonite; # Added 2017-05-02 + ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22 + amuleDaemon = throw "amuleDaemon was renamed to amule-daemon."; # Added 2022-02-11 + amuleGui = throw "amuleGui was renamed to amule-gui."; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 - arduino_core = arduino-core; # Added 2015-02-04 + arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed."; # Added 2020-09-09 - asciidocFull = asciidoc-full; # Added 2014-06-22 + asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07 - at_spi2_atk = at-spi2-atk; # Added 2018-02-25 - at_spi2_core = at-spi2-core; # Added 2018-02-25 + at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 + at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # Added 2020-12-26 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 @@ -83,8 +88,8 @@ mapAliases ({ ### B ### badtouch = authoscope; # Project was renamed, added 20210626 - bar-xft = lemonbar-xft; # Added 2015-01-16 - bashCompletion = bash-completion; # Added 2016-09-28 + bar-xft = throw "'bar-xft' has been renamed to/replaced by 'lemonbar-xft'"; # Converted to throw 2022-02-22 + bashCompletion = throw "'bashCompletion' has been renamed to/replaced by 'bash-completion'"; # Converted to throw 2022-02-22 bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 @@ -102,9 +107,11 @@ mapAliases ({ bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 - bridge_utils = bridge-utils; # Added 2015-02-20 + bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 - btrfsProgs = btrfs-progs; # Added 2016-01-03 + bird2 = bird; # Added 2022-02-21 + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 + btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; @@ -113,13 +120,14 @@ mapAliases ({ bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 - buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12 - buildkite-agent3 = buildkite-agent; # Added 2018-09-26 - bundler_HEAD = bundler; # Added 2015-11-15 + buildPerlPackage = throw "'buildPerlPackage' has been renamed to/replaced by 'perlPackages.buildPerlPackage'"; # Converted to throw 2022-02-22 + buildkite-agent3 = throw "'buildkite-agent3' has been renamed to/replaced by 'buildkite-agent'"; # Converted to throw 2022-02-22 + bundler_HEAD = throw "'bundler_HEAD' has been renamed to/replaced by 'bundler'"; # Converted to throw 2022-02-22 bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 @@ -128,20 +136,20 @@ mapAliases ({ caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13 - cantarell_fonts = cantarell-fonts; # Added 2018-03-03 + cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # Added 2019-12-22 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05 - checkbashism = checkbashisms; # Added 2016-08-16 + checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; - cifs_utils = cifs-utils; # Added 2016-08 + cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 - ckb = ckb-next; # Added 2018-10-21 + ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 callPackage_i686 = pkgsi686Linux.callPackage; creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 @@ -154,25 +162,26 @@ mapAliases ({ clang10Stdenv = lowPrio llvmPackages_10.stdenv; clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; + clang13Stdenv = lowPrio llvmPackages_13.stdenv; - clangAnalyzer = clang-analyzer; # Added 2015-02-20 + clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 - clawsMail = claws-mail; # Added 2016-04-29 - clutter_gtk = clutter-gtk; # Added 2018-02-25 + clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 + clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 codimd = hedgedoc; # Added 2020-11-29 compton = picom; # Added 2019-12-02 - compton-git = compton; # Added 2019-05-20 + compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 concurrencykit = libck; # Added 2021-03 - conntrack_tools = conntrack-tools; # Added 2018-05 - cool-old-term = cool-retro-term; # Added 2015-01-31 + conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 + cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 coprthr = throw "coprthr has been removed."; # Added 2019-12-08 coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 - cpp-gsl = microsoft_gsl; # Added 2019-05-24 + cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 @@ -201,30 +210,30 @@ mapAliases ({ cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - cupsBjnp = cups-bjnp; # Added 2016-01-02 - cups_filters = cups-filters; # Added 2016-08 + cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 + cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 - cv = progress; # Added 2015-09-06 + cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 cvs_fast_export = cvs-fast-export; # Added 2021-06-10 ### D ### - d1x_rebirth = dxx-rebirth; # Added 2018-04-25 - d2x_rebirth = dxx-rebirth; # Added 2018-04-25 + d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 + d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dbus_daemon = dbus.daemon; # Added 2018-04-25 - dbus_glib = dbus-glib; # Added 2018-02-25 - dbus_libs = dbus; # Added 2018-04-25 - dbus_tools = dbus.out; # Added 2018-04-25 + dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22 + dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22 + dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22 + dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22 dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 - deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23 + deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22 deadpixi-sam = deadpixi-sam-unstable; - debian_devscripts = debian-devscripts; # added 2016-03-23 + debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 @@ -243,23 +252,23 @@ mapAliases ({ ''; # Added 2021-08-18 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - desktop_file_utils = desktop-file-utils; # Added 2018-02-25 - devicemapper = lvm2; # Added 2018-04-25 - digikam5 = digikam; # Added 2017-02-18 + desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 + devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12 - dmtx = dmtx-utils; # Added 2018-04-25 + dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 dnnl = oneDNN; # Added 2020-04-22 - docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25 + docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 - docbook_xml_xslt = docbook_xsl; # Added 2018-04-25 - docker_compose = docker-compose; # Added 2018-11-10 + docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 + docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 - double_conversion = double-conversion; # Added 2017-11-22 + double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03 - dwarf_fortress = dwarf-fortress; # Added 2016-01-23 + dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07 dylibbundler = macdylibbundler; # Added 2021-04-24 @@ -286,22 +295,22 @@ mapAliases ({ emacs27Packages = emacs27.pkgs; # Added 2020-12-18 emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 emacsPackages = emacs.pkgs; # Added 2020-12-18 - emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 - emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 - enblendenfuse = enblend-enfuse; # Added 2015-09-30 + enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 epoxy = libepoxy; # Added 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 - etcdctl = etcd; # Added 2018-04-25 + etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01 evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14 - evolution_data_server = evolution-data-server; # Added 2018-02-25 - exfat-utils = exfat; # Added 2015-09-11 + evolution_data_server = throw "'evolution_data_server' has been renamed to/replaced by 'evolution-data-server'"; # Converted to throw 2022-02-22 + exfat-utils = throw "'exfat-utils' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 ### F ### @@ -310,15 +319,15 @@ mapAliases ({ fastnlo = fastnlo_toolkit; # Added 2021-04-24 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; - ffadoFull = ffado; # Added 2018-05-01 + ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; - firefox-esr-wrapper = firefox-esr; # Added 2016-01 - firefoxWrapper = firefox; # Added 2015-09 - firefox-wrapper = firefox; # Added 2016-01 + firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 + firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 + firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firestr = throw "firestr has been removed."; # Added 2019-12-08 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 - flameGraph = flamegraph; # Added 2018-04-25 + flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 @@ -329,7 +338,7 @@ mapAliases ({ flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03 fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 - font-awesome-ttf = font-awesome; # Added 2018-02-25 + font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. @@ -346,12 +355,12 @@ mapAliases ({ and has only been used for old fontconfig caches. ''; - foomatic_filters = foomatic-filters; # Added 2016-08 + foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 - fuse_exfat = exfat; # Added 2015-09-11 - fuseki = apache-jena-fuseki; # Added 2018-04-25 + fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 + fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 ### G ### @@ -359,10 +368,10 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03 - gdb-multitarget = gdb; # Added 2017-11-13 - gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22 + 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 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12 - gettextWithExpat = gettext; # Added 2016-02-19 + 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 giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 @@ -381,7 +390,7 @@ mapAliases ({ gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12 gksu = throw "gksu has been removed"; # Added 2022-01-16 - glib_networking = glib-networking; # Added 2018-02-25 + glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 gmailieer = lieer; # Added 2020-04-19 gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 @@ -389,12 +398,11 @@ mapAliases ({ gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = celluloid; # Added 2019-08-22 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 - gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14 + gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 gnome_user_docs = gnome-user-docs; # Added 2019-11-20 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10 - gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25 - gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25 - gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27 + gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 + gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -413,47 +421,47 @@ mapAliases ({ gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 - gnustep-make = gnustep.make; # Added 2016-7-6 + gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 gobby5 = gobby; # Added 2021-02-01 - gobjectIntrospection = gobject-introspection; # Added 2018-12-02 + gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 - goimports = gotools; # Added 2018-09-16 + goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 - googleAuthenticator = google-authenticator; # Added 2016-10-16 + googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 google-gflags = gflags; # Added 2019-07-25 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - go-pup = pup; # Added 2017-12-19 + go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 graalvm11 = graalvm11-ce; graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 - grantlee5 = libsForQt5.grantlee; # Added 2015-12-19 + grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 - gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25 - gtk_doc = gtk-doc; # Added 2018-02-25 + gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 + gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 - guileCairo = guile-cairo; # Added 2017-09-24 + guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 - guile_lib = guile-lib; # Added 2017-09-24 - guileLint = guile-lint; # Added 2017-09-27 - guile_ncurses = guile-ncurses; # Added 2017-09-24 - gupnp_av = gupnp-av; # Added 2018-02-25 - gupnp_dlna = gupnp-dlna; # Added 2018-02-25 - gupnp_igd = gupnp-igd; # Added 2018-02-25 - gupnptools = gupnp-tools; # Added 2015-12-19 - gutenberg = zola; # Added 2018-11-17 + guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22 + guileLint = throw "'guileLint' has been renamed to/replaced by 'guile-lint'"; # Converted to throw 2022-02-22 + guile_ncurses = throw "'guile_ncurses' has been renamed to/replaced by 'guile-ncurses'"; # Converted to throw 2022-02-22 + gupnp_av = throw "'gupnp_av' has been renamed to/replaced by 'gupnp-av'"; # Converted to throw 2022-02-22 + gupnp_dlna = throw "'gupnp_dlna' has been renamed to/replaced by 'gupnp-dlna'"; # Converted to throw 2022-02-22 + gupnp_igd = throw "'gupnp_igd' has been renamed to/replaced by 'gupnp-igd'"; # Converted to throw 2022-02-22 + gupnptools = throw "'gupnptools' has been renamed to/replaced by 'gupnp-tools'"; # Converted to throw 2022-02-22 + gutenberg = throw "'gutenberg' has been renamed to/replaced by 'zola'"; # Converted to throw 2022-02-22 gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06 gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06 @@ -461,24 +469,25 @@ mapAliases ({ hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 - heimdalFull = heimdal; # Added 2018-05-01 + heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11 - hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25 + hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 - htmlTidy = html-tidy; # Added 2014-12-06 + htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 ht-rust = xh; # Added 2021-02-13 hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06 ### I ### - iana_etc = iana-etc; # Added 2017-03-08 + iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream."; # Added 2022-02-15 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 - idea = jetbrains; # Added 2017-04-03 + idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 + imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 @@ -499,10 +508,10 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 - jbuilder = dune_1; # Added 2018-09-09 + jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # Added 2021-04-26 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; - joseki = apache-jena-fuseki; # Added 2016-02-28 + joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead."; # Julia @@ -512,7 +521,7 @@ mapAliases ({ julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 - json_glib = json-glib; # Added 2018-02-25 + json_glib = throw "'json_glib' has been renamed to/replaced by 'json-glib'"; # Converted to throw 2022-02-22 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 ### K ### @@ -523,15 +532,15 @@ mapAliases ({ kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 - kdiff3-qt5 = kdiff3; # Added 2017-02-18 - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 - keepassx-community = keepassxc; # Added 2017-11 - keepassx-reboot = keepassx-community; # Added 2017-02-01 - keepassx2-http = keepassx-reboot; # Added 2016-10-17 + kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 + keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 + keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 + keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 + keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - keybase-go = keybase; # Added 2016-08-24 + keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 @@ -545,73 +554,73 @@ mapAliases ({ kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 - krename-qt5 = krename; # Added 2017-02-18 + krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 - kvm = qemu_kvm; # Added 2018-04-25 + kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; - letsencrypt = certbot; # Added 2016-05-16 - libGL_driver = mesa.drivers; # Added 2019-05-28 - libaudit = audit; # Added 2018-04-25 - libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25 - libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25 - libcap_manpages = libcap.doc; # Added 2016-04-29 + letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 + libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 + libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 + libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 + libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 + libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 - libcap_progs = libcap.out; # Added 2016-04-29 + libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16 libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04 - libdbusmenu-glib = libdbusmenu; # Added 2018-05-01 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19 - liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12 - liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12 - liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12 + libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22 + libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22 + liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 + liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 + liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 libgksu = throw "libgksu has been removed"; # Added 2022-01-16 - libgnome_keyring = libgnome-keyring; # Added 2018-02-25 - libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25 + libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 + libgnome_keyring3 = throw "'libgnome_keyring3' has been renamed to/replaced by 'libgnome-keyring3'"; # Converted to throw 2022-02-22 libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 - libgumbo = gumbo; # Added 2018-01-21 + libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libjpeg_drop = libjpeg_original; # Added 2020-06-05 - libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28 + libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09 - liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05 + liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 - liblrdf = lrdf; # Added 2018-04-25 - libmsgpack = msgpack; # Added 2018-08-17 + liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 + libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 - libqrencode = qrencode; # Added 2019-01-01 + libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 librdf = lrdf; # Added 2020-03-22 - librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 libseat = seatd; # Added 2021-06-24 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # Added 2020-06-22 - libsysfs = sysfsutils; # Added 2018-04-25 - libtidy = html-tidy; # Added 2014-12-21 + libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 + libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; - libudev = udev; # Added 2018-04-25 + libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 - libva-full = libva; # Added 2018-03-26 - libva1-full = libva1; # Added 2018-03-26 + libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 + libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; lilypond-unstable = lilypond; # Added 2021-03-11 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 - links = links2; # Added 2016-01-31 + links = throw "'links' has been renamed to/replaced by 'links2'"; # Converted to throw 2022-02-22 linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09 # Linux kernels @@ -627,6 +636,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; + linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -643,6 +653,7 @@ mapAliases ({ linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi0 = linuxKernel.kernels.linux_rpi1; + linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; @@ -680,22 +691,22 @@ mapAliases ({ love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 - lttngTools = lttng-tools; # Added 2014-07-31 - lttngUst = lttng-ust; # Added 2014-07-31 - lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02 - lua5_expat = luaPackages.luaexpat; # Added 2017-05-02 - lua5_sec = luaPackages.luasec; # Added 2017-05-02 + lttngTools = throw "'lttngTools' has been renamed to/replaced by 'lttng-tools'"; # Converted to throw 2022-02-22 + lttngUst = throw "'lttngUst' has been renamed to/replaced by 'lttng-ust'"; # Converted to throw 2022-02-22 + lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 + lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 + lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 ### M ### - m3d-linux = m33-linux; # Added 2016-08-13 + m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 - man_db = man-db; # Added 2016-05 - manpages = man-pages; # Added 2015-12-06 + man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 + manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 @@ -706,13 +717,13 @@ mapAliases ({ mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # Added 2021-04-21 - memtest86 = memtest86plus; # Added 2019-05-08 + memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12 - midoriWrapper = midori; # Added 2015-01 + midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 @@ -720,23 +731,23 @@ mapAliases ({ minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 - mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19 - mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25 + mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 + mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; - module_init_tools = kmod; # Added 2016-04-22 + module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 - morituri = whipper; # Added 2018-09-13 + morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 mozart-binary = mozart2-binary; # Added 2019-09-23 mozart = mozart2-binary; # Added 2019-09-23 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 - mpich2 = mpich; # Added 2018-08-06 - msf = metasploit; # Added 2018-04-25 + mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 mumble_git = pkgs.mumble; # Added 2019-08-01 murmur_git = pkgs.murmur; # Added 2019-08-01 @@ -749,36 +760,36 @@ mapAliases ({ # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesa_noglu = mesa; # Added 2019-05-28 + mesa_noglu = throw "'mesa_noglu' has been renamed to/replaced by 'mesa'"; # Converted to throw 2022-02-22 mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 - mssys = ms-sys; # Added 2015-12-13 - multipath_tools = multipath-tools; # Added 2016-01-21 + mssys = throw "'mssys' has been renamed to/replaced by 'ms-sys'"; # Converted to throw 2022-02-22 + multipath_tools = throw "'multipath_tools' has been renamed to/replaced by 'multipath-tools'"; # Converted to throw 2022-02-22 mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 - mupen64plus1_5 = mupen64plus; # Added 2016-02-12 + mupen64plus1_5 = throw "'mupen64plus1_5' has been renamed to/replaced by 'mupen64plus'"; # Converted to throw 2022-02-22 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15 - mysqlWorkbench = mysql-workbench; # Added 2017-01-19 + mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22 ### N ### net_snmp = net-snmp; # Added 2019-12-21 nagiosPluginsOfficial = monitoring-plugins; navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 - ncat = nmap; # Added 2016-01-26 + ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 - netcat-openbsd = libressl.nc; # Added 2018-04-25 + netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25 + networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 + networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 + networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 + networkmanager_openconnect = throw "'networkmanager_openconnect' has been renamed to/replaced by 'networkmanager-openconnect'"; # Converted to throw 2022-02-22 + networkmanager_openvpn = throw "'networkmanager_openvpn' has been renamed to/replaced by 'networkmanager-openvpn'"; # Converted to throw 2022-02-22 + networkmanager_vpnc = throw "'networkmanager_vpnc' has been renamed to/replaced by 'networkmanager-vpnc'"; # Converted to throw 2022-02-22 neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - nfsUtils = nfs-utils; # Added 2014-12-06 - nginxUnstable = nginxMainline; # Added 2018-04-25 - nilfs_utils = nilfs-utils; # Added 2018-04-25 + nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 + nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 + nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # Added 2019-12-22 nixFlakes = nixVersions.stable; # Added 2021-05-21 @@ -788,14 +799,15 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; + nixopsUnstable = nixops_unstable; # Added 2022-03-03 nmap-unfree = nmap; # Added 2021-04-06 - nmap_graphical = nmap-graphical; # Added 2017-01-19 - nologin = shadow; # Added 2018-04-25 + nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22 + nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 - nxproxy = nx-libs; # Added 2019-02-15 + nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; ### O ### @@ -812,42 +824,43 @@ mapAliases ({ onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 - opencascade_oce = opencascade; # Added 2018-04-25 - opencl-icd = ocl-icd; # Added 2017-01-20 + opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 + opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 - openexr_ctl = ctl; # Added 2018-04-25 + openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 openisns = open-isns; # Added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 openjpeg_2 = openjpeg; # Added 2021-01-25 openmpt123 = libopenmpt; # Added 2021-09-05 - opensans-ttf = open-sans; # Added 2018-12-04 - openssh_with_kerberos = openssh; # Added 2018-01-28 + opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 + openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 orchis = orchis-theme; # Added 2021-06-09 osquery = throw "osquery has been removed."; # Added 2019-11-24 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 - owncloudclient = owncloud-client; # Added 2016-08 + owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 ### P ### - PPSSPP = ppsspp; # Added 2017-10-01 + PPSSPP = throw "'PPSSPP' has been renamed to/replaced by 'ppsspp'"; # Converted to throw 2022-02-22 - p11_kit = p11-kit; # Added 2018-02-25 + p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 paperless = paperless-ng; # Added 2021-06-06 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parquet-cpp = arrow-cpp; # Added 2018-09-08 - pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04 + parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 + pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01 pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 - perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12 - perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12 - pgp-tools = signing-party; # Added 2017-03-26 - pg_tmp = ephemeralpg; # Added 2018-01-16 + perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 + perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 + pgadmin = pgadmin4; + pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 + pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 @@ -902,26 +915,26 @@ mapAliases ({ php73Packages-unit = phpPackages-unit; php74Packages-unit = phpPackages-unit; - pidgin-with-plugins = pidgin; # Added 2016-06 - pidginlatex = pidgin-latex; # Added 2018-01-08 - pidginlatexSF = pidgin-latex; # Added 2014-11-02 - pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08 - pidginosd = pidgin-osd; # Added 2018-01-08 - pidginotr = pidgin-otr; # Added 2018-01-08 - pidginsipe = pidgin-sipe; # Added 2018-01-08 - pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08 + pidgin-with-plugins = throw "'pidgin-with-plugins' has been renamed to/replaced by 'pidgin'"; # Converted to throw 2022-02-22 + pidginlatex = throw "'pidginlatex' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 + pidginlatexSF = throw "'pidginlatexSF' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 + pidginmsnpecan = throw "'pidginmsnpecan' has been renamed to/replaced by 'pidgin-msn-pecan'"; # Converted to throw 2022-02-22 + pidginosd = throw "'pidginosd' has been renamed to/replaced by 'pidgin-osd'"; # Converted to throw 2022-02-22 + pidginotr = throw "'pidginotr' has been renamed to/replaced by 'pidgin-otr'"; # Converted to throw 2022-02-22 + pidginsipe = throw "'pidginsipe' has been renamed to/replaced by 'pidgin-sipe'"; # Converted to throw 2022-02-22 + pidginwindowmerge = throw "'pidginwindowmerge' has been renamed to/replaced by 'pidgin-window-merge'"; # Converted to throw 2022-02-22 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19 - piwik = matomo; # Added 2018-01-16 + piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 - pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02 + pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02 pleroma-otp = pleroma; # Added 2021-07-10 - plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 + plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure - pmtools = acpica-tools; # Added 2018-11-01 - polarssl = mbedtls; # Added 2018-04-25 + pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 + polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 - poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19 + poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 # postgresql postgresql96 = postgresql_9_6; @@ -957,11 +970,11 @@ mapAliases ({ pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 processing3 = processing; # Added 2019-08-16 - procps-ng = procps; # Added 2018-06-08 + procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12 prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16 - pulseaudioLight = pulseaudio; # Added 2018-04-25 + pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; @@ -984,8 +997,8 @@ mapAliases ({ ### Q ### - QmidiNet = qmidinet; # Added 2016-05-22 - qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19 + QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 + qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 @@ -996,12 +1009,12 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 - quake3game = ioquake3; # Added 2016-01-14 + quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03 qvim = throw "qvim has been removed."; # Added 2020-08-31 qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 - qwt6 = libsForQt5.qwt; # Added 2015-12-19 + qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 ### R ### @@ -1009,8 +1022,8 @@ mapAliases ({ raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01 rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21 - rdiff_backup = rdiff-backup; # Added 2014-11-23 - rdmd = dtools; # Added 2017-08-19 + rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 + rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 @@ -1026,15 +1039,14 @@ mapAliases ({ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 - rng_tools = rng-tools; # Added 2018-10-24 - robomongo = robo3t; #added 2017-09-28 + rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 + robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rpiboot-unstable = rpiboot; # Added 2021-07-30 - rssglx = rss-glx; #added 2015-03-25 + rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rubyMinimal = throw "rubyMinimal was removed due to being unused"; - rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 @@ -1049,43 +1061,44 @@ mapAliases ({ ### S ### s2n = s2n-tls; # Added 2021-03-03 - s6Dns = s6-dns; # Added 2018-07-23 - s6LinuxUtils = s6-linux-utils; # Added 2018-07-23 - s6Networking = s6-networking; # Added 2018-07-23 - s6PortableUtils = s6-portable-utils; # Added 2018-07-23 - sagemath = sage; # Added 2018-10-27 - sam = deadpixi-sam; # Added 2018-04-25 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25 + s6Dns = throw "'s6Dns' has been renamed to/replaced by 's6-dns'"; # Converted to throw 2022-02-22 + s6LinuxUtils = throw "'s6LinuxUtils' has been renamed to/replaced by 's6-linux-utils'"; # Converted to throw 2022-02-22 + s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22 + s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22 + sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22 + sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 + samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 sane-backends-git = sane-backends; # Added 2021-02-19 - saneBackends = sane-backends; # Added 2016-01-02 - saneBackendsGit = sane-backends; # Added 2016-01-02 - saneFrontends = sane-frontends; # Added 2016-01-02 + saneBackends = throw "'saneBackends' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 + saneBackendsGit = throw "'saneBackendsGit' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 + saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 - scim = sc-im; # Added 2016-01-22 - scollector = bosun; # Added 2018-04-25 + scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 + scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 + scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 - shared_mime_info = shared-mime-info; # Added 2018-02-25 + shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 - skrooge2 = skrooge; # Added 2017-02-18 + skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; - skype = skypeforlinux; # Added 2017-07-27 + skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 - slic3r-prusa3d = prusa-slicer; # Added 2019-05-21 + slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 - slurm-full = slurm; # Added 2018-05-1 + slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 - smbclient = samba; # Added 2018-04-25 + smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04 solr_8 = solr; # Added 2021-01-30 @@ -1113,12 +1126,12 @@ mapAliases ({ source-sans-pro = source-sans; # Added 2021-10-20 source-serif-pro = source-serif; # Added 2021-10-20 - spaceOrbit = space-orbit; # added 2016-05-23 + spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 - speech_tools = speech-tools; # added 2018-04-25 - speedtest_cli = speedtest-cli; # added 2015-02-17 - spice_gtk = spice-gtk; # added 2018-02-25 - spice_protocol = spice-protocol; # added 2018-02-25 + speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 + speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 + spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 + spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # Added 2019-10-16 @@ -1127,56 +1140,57 @@ mapAliases ({ # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 spring-boot = spring-boot-cli; # added 2020-04-24 - sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 - sqliteInteractive = sqlite-interactive; # Added 2014-12-06 + sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 + sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 squid4 = squid; # added 2019-08-22 - sshfsFuse = sshfs-fuse; # added 2016-09 + sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + steam-run-native = steam-run; # added 2022-02-21 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; - surf-webkit2 = surf; # Added 2017-04-02 + surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17 swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 - system_config_printer = system-config-printer; # Added 2016-01-03 + system_config_printer = throw "'system_config_printer' has been renamed to/replaced by 'system-config-printer'"; # Converted to throw 2022-02-22 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 - systool = sysfsutils; # Added 2018-04-25 + systool = throw "'systool' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ### T ### - tahoelafs = tahoe-lafs; # Added 2018-03-26 + tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02 - telepathy_farstream = telepathy-farstream; # Added 2018-02-25 - telepathy_gabble = telepathy-gabble; # Added 2018-02-25 - telepathy_glib = telepathy-glib; # Added 2018-02-25 - telepathy_haze = telepathy-haze; # Added 2018-02-25 - telepathy_idle = telepathy-idle; # Added 2018-02-25 - telepathy_logger = telepathy-logger; # Added 2018-02-25 - telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25 - telepathy_qt = telepathy-qt; # Added 2018-02-25 - telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19 - telepathy_salut = telepathy-salut; # Added 2018-02-25 - telnet = inetutils; # Added 2018-05-15 + telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 + telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 + telepathy_glib = throw "'telepathy_glib' has been renamed to/replaced by 'telepathy-glib'"; # Converted to throw 2022-02-22 + telepathy_haze = throw "'telepathy_haze' has been renamed to/replaced by 'telepathy-haze'"; # Converted to throw 2022-02-22 + telepathy_idle = throw "'telepathy_idle' has been renamed to/replaced by 'telepathy-idle'"; # Converted to throw 2022-02-22 + telepathy_logger = throw "'telepathy_logger' has been renamed to/replaced by 'telepathy-logger'"; # Converted to throw 2022-02-22 + telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22 + telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 + telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 + telepathy_salut = throw "'telepathy_salut' has been renamed to/replaced by 'telepathy-salut'"; # Converted to throw 2022-02-22 + telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28 - terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28 + terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 + terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22 terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 - tesseract_4 = tesseract4; # Added 2018-12-19 - tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03 - tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03 - tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03 - tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03 - tftp_hpa = tftp-hpa; # Added 2015-04-03 + tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 + tex-gyre-bonum-math = throw "'tex-gyre-bonum-math' has been renamed to/replaced by 'tex-gyre-math.bonum'"; # Converted to throw 2022-02-22 + tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 + tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 + tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 + tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25."; thunderbird-bin-68 = thunderbird-68; timescale-prometheus = promscale; # Added 2020-09-29 @@ -1187,21 +1201,21 @@ mapAliases ({ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11 tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01 - torbrowser = tor-browser-bundle-bin; # Added 2017-04-05 + torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - trang = jing-trang; # Added 2018-04-25 + trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 - transmission_gtk = transmission-gtk; # Added 2018-01-06 - transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 + transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 + transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29 - truecrypt = veracrypt; # Added 2018-10-24 - tshark = wireshark-cli; # Added 2018-04-25 + truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 + tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11 @@ -1210,9 +1224,9 @@ mapAliases ({ uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 - ucsFonts = ucs-fonts; # Added 2016-07-15 + ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11 - ultrastardx-beta = ultrastardx; # Added 2017-08-12 + ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 unifiStable = unifi6; # Added 2020-12-28 untrunc = untrunc-anthwlock; # Added 2021-02-01 @@ -1224,7 +1238,7 @@ mapAliases ({ urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 - usb_modeswitch = usb-modeswitch; # Added 2016-05-10 + usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = usbguard; # Added 2019-09-04 utillinux = util-linux; # Added 2020-11-24 uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; @@ -1240,62 +1254,63 @@ mapAliases ({ varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 - vimbWrapper = vimb; # Added 2015-01 + vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 + virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 virtmanager = virt-manager; # Added 2019-10-29 virtmanager-qt = virt-manager-qt; # Added 2019-10-29 - virtviewer = virt-viewer; # Added 2015-12-24 - vorbisTools = vorbis-tools; # Added 2016-01-26 + virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 + vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29 ### W ### way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 - webkit = webkitgtk; # Added 2019-03-05 + webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 - weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron."; # added 2022-02-08 wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 - wineFull = winePackages.full; # Added 2017-05-27 - wineMinimal = winePackages.minimal; # Added 2017-05-27 - wineStable = winePackages.stable; # Added 2017-05-27 - wineStaging = wine-staging; # Added 2018-01-08 - wineUnstable = winePackages.unstable; # Added 2017-05-27 + wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22 + wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22 + wineStable = throw "'wineStable' has been renamed to/replaced by 'winePackages.stable'"; # Converted to throw 2022-02-22 + wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 + wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10 - winusb = woeusb; # Added 2017-12-22 - wireguard = wireguard-tools; # Added 2018-05-19 + winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 + wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31 ### X ### - x11 = xlibsWrapper; # Added 2015-09 + x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22 xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 - xbmc = kodi; # Added 2018-04-25 + xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 - xbmcPlain = kodiPlain; # Added 2018-04-25 - xbmcPlugins = kodiPackages; # Added 2018-04-25 + xbmcPlain = throw "'xbmcPlain' has been renamed to/replaced by 'kodiPlain'"; # Converted to throw 2022-02-22 + xbmcPlugins = throw "'xbmcPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2022-02-22 xdg_utils = xdg-utils; # Added 2021-02-01 xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 xfce4-14 = xfce; xfceUnstable = xfce4-14; # Added 2019-09-17 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 - xmonad_log_applet_gnome3 = xmonad_log_applet; # Added 2018-05-01 + xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; xp-pen-g430 = pentablet-driver; # Added 2020-05-03 - xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09 + xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 xf86_input_mtrack = throw '' xf86_input_mtrack has been removed from nixpkgs as it is broken and unmaintained. Working alternatives are libinput and synaptics. ''; xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20 - xlibs = xorg; # Added 2015-09 - xpraGtk3 = xpra; # Added 2018-09-13 + xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 + xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 xvfb_run = xvfb-run; # Added 2021-05-07 @@ -1303,7 +1318,7 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 - youtubeDL = youtube-dl; # Added 2014-10-26 + youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08 yuzu = yuzu-mainline; # Added 2021-01-25 @@ -1311,15 +1326,22 @@ mapAliases ({ ### Z ### zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 - zdfmediathk = mediathekview; # Added 2019-01-19 + zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - inherit (ocaml-ng) # Added 2016-09-14 - ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 - ocamlPackages_4_03 ocamlPackages_latest; + ocamlPackages_4_00_1 = throw "'ocamlPackages_4_00_1' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1'"; # Converted to throw 2022-02-22 + ocamlPackages_4_01_0 = throw "'ocamlPackages_4_01_0' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0'"; # Converted to throw 2022-02-22 + ocamlPackages_4_02 = throw "'ocamlPackages_4_02' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02'"; # Converted to throw 2022-02-22 + ocamlPackages_4_03 = throw "'ocamlPackages_4_03' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03'"; # Converted to throw 2022-02-22 + ocamlPackages_latest = throw "'ocamlPackages_latest' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_latest'"; # Converted to throw 2022-02-22 + + ocaml_4_00_1 = throw "'ocamlPackages_4_00_1.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_01_0 = throw "'ocamlPackages_4_01_0.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22 + ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22 zabbix44 = throw '' Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at @@ -1333,13 +1355,6 @@ mapAliases ({ zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { # Added 2016-09-14 - ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; - ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; - ocaml_4_02 = ocamlPackages_4_02.ocaml; - ocaml_4_03 = ocamlPackages_4_03.ocaml; -}) // { - avian = throw '' The package doesn't compile anymore on NixOS and both development & maintenance is abandoned by upstream. @@ -1387,7 +1402,6 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 - tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 @@ -1415,17 +1429,19 @@ mapAliases ({ kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares - ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake + sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake + zanshin ; inherit (plasma5Packages.thirdParty) krohnkite + krunner-ssh krunner-symbols kwin-dynamic-workspaces kwin-tiling diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 4d94e08657..31ac1d87b4 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -107,6 +107,10 @@ with pkgs; genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + gitUpdater = callPackage ../common-updater/git-updater.nix { }; + + httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; + unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; nix-update-script = callPackage ../common-updater/nix-update.nix { }; @@ -460,6 +464,8 @@ with pkgs; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; + mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../build-support/dotnet/make-nuget-deps { }; dotnetenv = callPackage ../build-support/dotnet/dotnetenv { dotnetfx = dotnetfx40; @@ -540,6 +546,10 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; + opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; + + owl = callPackage ../tools/networking/owl { }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -821,8 +831,9 @@ with pkgs; writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; - desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; } - ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; + desktopToDarwinBundle = makeSetupHook { + deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; + } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; @@ -879,6 +890,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; + a2ps = callPackage ../tools/text/a2ps { }; abcm2ps = callPackage ../tools/audio/abcm2ps { }; @@ -1014,14 +1027,20 @@ with pkgs; albert = libsForQt5.callPackage ../applications/misc/albert {}; + aquosctl = callPackage ../tools/misc/aquosctl { }; + arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; auditwheel = callPackage ../tools/package-management/auditwheel { }; amidst = callPackage ../tools/games/minecraft/amidst { }; + cf-vault = callPackage ../tools/admin/cf-vault { }; + cope = callPackage ../tools/misc/cope { }; + ejson2env = callPackage ../tools/admin/ejson2env { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -1058,6 +1077,8 @@ with pkgs; metapixel = callPackage ../tools/graphics/metapixel { }; + midimonster = callPackage ../tools/audio/midimonster { }; + pferd = callPackage ../tools/misc/pferd {}; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; @@ -1070,6 +1091,8 @@ with pkgs; tauon = callPackage ../applications/audio/tauon { }; + termusic = callPackage ../applications/audio/termusic { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; @@ -1087,6 +1110,8 @@ with pkgs; use64 = true; }; + writedisk = callPackage ../tools/misc/writedisk { }; + xcd = callPackage ../tools/misc/xcd { }; xrootd = callPackage ../tools/networking/xrootd { }; @@ -1532,15 +1557,15 @@ with pkgs; amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (amule.override { + amule-daemon = amule.override { monolithic = false; enableDaemon = true; - }); + }; - amuleGui = appendToName "gui" (amule.override { + amule-gui = amule.override { monolithic = false; client = true; - }); + }; antennas = nodePackages.antennas; @@ -1730,6 +1755,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + distrobox = callPackage ../applications/virtualization/distrobox { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -1746,6 +1773,8 @@ with pkgs; doona = callPackage ../tools/security/doona { }; + dotter = callPackage ../tools/misc/dotter { }; + droidcam = callPackage ../applications/video/droidcam { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; @@ -2548,7 +2577,7 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; - cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -3603,6 +3632,8 @@ with pkgs; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + oil-buku = callPackage ../applications/misc/oil { }; + ossutil = callPackage ../tools/admin/ossutil {}; pastel = callPackage ../applications/misc/pastel { @@ -3651,6 +3682,8 @@ with pkgs; precice = callPackage ../development/libraries/precice { }; + precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { }; + pueue = callPackage ../applications/misc/pueue { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -3882,20 +3915,20 @@ with pkgs; enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (asciidoc.override { + asciidoc-full = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; - }); + }; - asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { + asciidoc-full-with-plugins = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; enableExtraPlugins = true; - }); + }; asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; @@ -4053,7 +4086,7 @@ with pkgs; davix = callPackage ../tools/networking/davix { }; - davix-copy = appendToName "copy" (davix.override { enableThirdPartyCopy = true; }); + davix-copy = davix.override { enableThirdPartyCopy = true; }; cantata = libsForQt5.callPackage ../applications/audio/cantata { }; @@ -4198,6 +4231,8 @@ with pkgs; colord-gtk = callPackage ../tools/misc/colord-gtk { }; + colord-gtk4 = colord-gtk.override { withGtk4 = true; }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { }; @@ -4517,7 +4552,8 @@ with pkgs; cudatoolkit_11_2 cudatoolkit_11_3 cudatoolkit_11_4 - cudatoolkit_11_5; + cudatoolkit_11_5 + cudatoolkit_11_6; cudatoolkit = cudatoolkit_10; @@ -4999,7 +5035,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; + electron = electron_15; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh @@ -5176,6 +5212,8 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; + endlessh-go = callPackage ../servers/endlessh-go { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -5528,8 +5566,6 @@ with pkgs; fpm = callPackage ../tools/package-management/fpm { }; - fprot = callPackage ../tools/security/fprot { }; - fprintd = callPackage ../tools/security/fprintd { }; fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; @@ -5665,8 +5701,7 @@ with pkgs; }; gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; - gawkInteractive = appendToName "interactive" - (gawk.override { interactive = true; }); + gawkInteractive = gawk.override { interactive = true; }; gawp = callPackage ../tools/misc/gawp { }; @@ -6181,6 +6216,10 @@ with pkgs; grin = callPackage ../tools/text/grin { }; + igrep = callPackage ../tools/text/igrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ripgrep = callPackage ../tools/text/ripgrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6411,6 +6450,8 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; + hcl2json = callPackage ../applications/misc/hcl2json { }; + hcxtools = callPackage ../tools/security/hcxtools { }; hcxdumptool = callPackage ../tools/security/hcxdumptool { }; @@ -6430,24 +6471,13 @@ with pkgs; hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; - hdf5-mpi = appendToName "mpi" (hdf5.override { - mpiSupport = true; - }); + hdf5-mpi = hdf5.override { mpiSupport = true; }; - hdf5-cpp = appendToName "cpp" (hdf5.override { - cppSupport = true; - }); + hdf5-cpp = hdf5.override { cppSupport = true; }; - hdf5-fortran = appendToName "fortran" (hdf5.override { - fortranSupport = true; - }); + hdf5-fortran = hdf5.override { fortranSupport = true; }; - hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { - # Threadsafe hdf5 - # However, hdf5 hl (High Level) library is not considered stable - # with thread safety and should be disabled. - configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; - })); + hdf5-threadsafe = hdf5.override { threadsafe = true; }; hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; @@ -6608,13 +6638,15 @@ with pkgs; }; inherit (callPackages ../tools/filesystems/irods rec { - stdenv = llvmPackages.libcxxStdenv; - libcxx = llvmPackages.libcxx; - boost = boost160.override { inherit stdenv; }; - avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; - }) - irods - irods-icommands; + stdenv = llvmPackages.libcxxStdenv; + libcxx = llvmPackages.libcxx; + boost = boost17x.override { inherit stdenv; }; + fmt = fmt_8.override { inherit stdenv; }; + nanodbc_llvm = nanodbc.override { inherit stdenv; }; + avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; + }) + irods + irods-icommands; ignite = callPackage ../applications/virtualization/ignite { }; @@ -6634,10 +6666,6 @@ with pkgs; ike-scan = callPackage ../tools/security/ike-scan { }; - imapproxy = callPackage ../tools/networking/imapproxy { - openssl = openssl_1_0_2; - }; - imapsync = callPackage ../tools/networking/imapsync { }; imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { }; @@ -6722,13 +6750,16 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { - buildGoModule = buildGo116Module; - }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo116Module; }; + ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { + buildGoModule = buildGo116Module; + }; + ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; + ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + ipget = callPackage ../applications/networking/ipget { }; i-pi = with python3Packages; toPythonApplication i-pi; @@ -7435,7 +7466,7 @@ with pkgs; leatherman = callPackage ../development/libraries/leatherman { }; ledit = callPackage ../tools/misc/ledit { - inherit (ocamlPackages) camlp5; + inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5; }; ledmon = callPackage ../tools/system/ledmon { }; @@ -7827,7 +7858,9 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../applications/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { + inherit (darwin) libiconv; + }; mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; @@ -8071,13 +8104,15 @@ with pkgs; netatalk = callPackage ../tools/filesystems/netatalk { }; + netavark = callPackage ../tools/networking/netavark { }; + netcdf = callPackage ../development/libraries/netcdf { hdf5 = hdf5.override { usev110Api = true; }; }; - netcdf-mpi = appendToName "mpi" (netcdf.override { + netcdf-mpi = netcdf.override { hdf5 = hdf5-mpi.override { usev110Api = true; }; - }); + }; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; @@ -8150,6 +8185,8 @@ with pkgs; libnma = callPackage ../tools/networking/networkmanager/libnma { }; + libnma-gtk4 = libnma.override { withGtk4 = true; }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; @@ -8966,10 +9003,7 @@ with pkgs; podiff = callPackage ../tools/text/podiff { }; - podman = if stdenv.isDarwin then - callPackage ../applications/virtualization/podman { } - else - callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -9151,6 +9185,8 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; + rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { jack = libjack2; inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -9283,6 +9319,8 @@ with pkgs; rcon = callPackage ../tools/networking/rcon { }; + rdap = callPackage ../tools/networking/rdap { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; rdma-core = callPackage ../os-specific/linux/rdma-core { }; @@ -9603,8 +9641,6 @@ with pkgs; sasview = libsForQt5.callPackage ../applications/science/misc/sasview {}; - scallion = callPackage ../tools/security/scallion { }; - scanbd = callPackage ../tools/graphics/scanbd { }; scdoc = callPackage ../tools/typesetting/scdoc { }; @@ -9715,6 +9751,8 @@ with pkgs; shelldap = callPackage ../tools/misc/shelldap { }; + shellspec = callPackage ../tools/misc/shellspec { }; + schema2ldif = callPackage ../tools/text/schema2ldif { }; sharedown = callPackage ../tools/misc/sharedown { }; @@ -9798,7 +9836,9 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { }; + sks = callPackage ../servers/sks { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; skydns = callPackage ../servers/skydns { }; @@ -9846,6 +9886,8 @@ with pkgs; smu = callPackage ../tools/text/smu { }; + smug = callPackage ../tools/misc/smug { }; + smpq = callPackage ../applications/misc/smpq { }; sn0int = callPackage ../tools/security/sn0int { }; @@ -10595,7 +10637,7 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; + txr = callPackage ../tools/misc/txr { inherit (llvmPackages_latest) stdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -10819,6 +10861,8 @@ with pkgs; SDL = SDL_sixel; }; + vtm = callPackage ../tools/misc/vtm { }; + witness = callPackage ../tools/security/witness { }; openconnect = openconnect_gnutls; @@ -11412,7 +11456,9 @@ with pkgs; zdelta = callPackage ../tools/compression/zdelta { }; - zellij = callPackage ../tools/misc/zellij { }; + zellij = callPackage ../tools/misc/zellij { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -11540,6 +11586,12 @@ with pkgs; interactive = true; withDocs = true; }; + bashInteractiveFHS = callPackage ../shells/bash/5.1.nix { + binutils = stdenv.cc.bintools; + interactive = true; + withDocs = true; + forFHSEnv = true; + }; bash-completion = callPackage ../shells/bash/bash-completion { }; @@ -11829,6 +11881,7 @@ with pkgs; }; }; + clang_14 = llvmPackages_14.clang; clang_13 = llvmPackages_13.clang; clang_12 = llvmPackages_12.clang; clang_11 = llvmPackages_11.clang; @@ -12656,10 +12709,9 @@ with pkgs; jdkdistro = oraclejdk8distro; oraclejdk8distro = installjdk: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { - inherit installjdk pluginSupport; - }); + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { + inherit installjdk pluginSupport; + }); oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; @@ -12771,6 +12823,7 @@ with pkgs; lld_11 = llvmPackages_11.lld; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld; + lld_14 = llvmPackages_14.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -12782,11 +12835,13 @@ with pkgs; lldb_11 = llvmPackages_11.lldb; lldb_12 = llvmPackages_12.lldb; lldb_13 = llvmPackages_13.lldb; + lldb_14 = llvmPackages_14.lldb; llvm = llvmPackages.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_14 = llvmPackages_14.llvm; llvm_13 = llvmPackages_13.llvm; llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; @@ -12876,6 +12931,14 @@ with pkgs; stdenv = gcc7Stdenv; })); + llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_14.tools; + targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); + llvmPackages_latest = llvmPackages_13; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -13428,7 +13491,6 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_48 - vala_0_52 vala_0_54 vala; @@ -13612,6 +13674,10 @@ with pkgs; duktape = callPackage ../development/interpreters/duktape { }; + duckscript = callPackage ../development/tools/rust/duckscript { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + evcxr = callPackage ../development/interpreters/evcxr { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -13978,7 +14044,7 @@ with pkgs; regina = callPackage ../development/interpreters/regina { }; - inherit (ocamlPackages) reason; + inherit (ocaml-ng.ocamlPackages_4_12) reason; pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; @@ -14884,6 +14950,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; + ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; fly = callPackage ../development/tools/continuous-integration/fly { }; @@ -15013,6 +15080,8 @@ with pkgs; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7; + grcov = callPackage ../development/tools/misc/grcov { }; + gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { }; @@ -15318,7 +15387,7 @@ with pkgs; nrfutil = callPackage ../development/tools/misc/nrfutil { }; - obelisk = callPackage ../development/tools/ocaml/obelisk { }; + obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; }; obuild = callPackage ../development/tools/ocaml/obuild { }; @@ -15721,9 +15790,7 @@ with pkgs; 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; - texinfoInteractive = appendToName "interactive" ( - texinfo.override { interactive = true; } - ); + texinfoInteractive = texinfo.override { interactive = true; }; texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -16519,6 +16586,8 @@ with pkgs; fcl = callPackage ../development/libraries/fcl { }; + febio = callPackage ../development/libraries/febio { }; + ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; @@ -17241,9 +17310,7 @@ with pkgs; highfive = callPackage ../development/libraries/highfive { }; - highfive-mpi = appendToName "mpi" (highfive.override { - hdf5 = hdf5-mpi; - }); + highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; hiredis = callPackage ../development/libraries/hiredis { }; @@ -17940,6 +18007,8 @@ with pkgs; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring3 = gnome.libgnome-keyring; + libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; + libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; libglvnd = callPackage ../development/libraries/libglvnd { }; @@ -18529,6 +18598,8 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; + libpulsar = callPackage ../development/libraries/libpulsar { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; libqalculate = callPackage ../development/libraries/libqalculate { @@ -18789,6 +18860,8 @@ with pkgs; libvori = callPackage ../development/libraries/libvori { }; + libwbxml = callPackage ../development/libraries/libwbxml { }; + libwebcam = callPackage ../os-specific/linux/libwebcam { }; libwebp = callPackage ../development/libraries/libwebp { }; @@ -19115,6 +19188,8 @@ with pkgs; mythes = callPackage ../development/libraries/mythes { }; + nanodbc = callPackage ../development/libraries/nanodbc { }; + nanoflann = callPackage ../development/libraries/nanoflann { }; nanomsg = callPackage ../development/libraries/nanomsg { }; @@ -19527,6 +19602,8 @@ with pkgs; buildPythonApplication click future six; }; + pru = callPackage ../tools/text/pru { }; + prospector = callPackage ../development/tools/prospector { }; protobuf = protobuf3_19; @@ -19614,12 +19691,12 @@ with pkgs; qmake4Hook = qmake48Hook; - qt48Full = appendToName "full" (qt48.override { + qt48Full = qt48.override { docs = true; demos = true; examples = true; developerBuild = true; - }); + }; qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { @@ -20046,8 +20123,6 @@ with pkgs; sope = callPackage ../development/libraries/sope { }; - soprano = callPackage ../development/libraries/soprano { }; - sord = callPackage ../development/libraries/sord {}; soundtouch = callPackage ../development/libraries/soundtouch {}; @@ -20123,7 +20198,7 @@ with pkgs; sqlitecpp = callPackage ../development/libraries/sqlitecpp { }; - sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; + sqlite-interactive = (sqlite.override { interactive = true; }).bin; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; @@ -20496,20 +20571,26 @@ with pkgs; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; wxGTK = wxGTK28; - wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; + }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { @@ -21004,8 +21085,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = bind.dnsutils; - inherit (callPackages ../servers/bird { }) - bird bird6 bird2; + bird = callPackage ../servers/bird { }; bosun = callPackage ../servers/monitoring/bosun { }; @@ -21447,6 +21527,7 @@ with pkgs; openresty = callPackage ../servers/http/openresty { withPerl = false; + modules = []; }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; @@ -21486,6 +21567,7 @@ with pkgs; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; pomerium = callPackage ../servers/http/pomerium { }; + pomerium-cli = callPackage ../tools/security/pomerium-cli { }; postgrey = callPackage ../servers/mail/postgrey { }; @@ -22046,16 +22128,6 @@ with pkgs; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { - openssl = openssl_1_0_2; - }; - - virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { - openssl = openssl_1_0_2; - }; - - virtuoso = virtuoso6; - vsftpd = callPackage ../servers/ftp/vsftpd { }; wallabag = callPackage ../servers/web-apps/wallabag { }; @@ -22387,6 +22459,8 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; + gometer = callPackage ../applications/misc/gometer { }; + gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate {}; @@ -23569,6 +23643,8 @@ with pkgs; inherit (nodePackages) svgo; }; + emojipick = callPackage ../applications/misc/emojipick { }; + encode-sans = callPackage ../data/fonts/encode-sans { }; envypn-font = callPackage ../data/fonts/envypn-font @@ -23802,6 +23878,8 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; + lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; + maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -24087,6 +24165,8 @@ with pkgs; soundfont-fluid = callPackage ../data/soundfonts/fluid { }; + soundfont-ydp-grand = callPackage ../data/soundfonts/ydp-grand { }; + spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; @@ -24481,6 +24561,8 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; + argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; + ario = callPackage ../applications/audio/ario { }; arion = callPackage ../applications/virtualization/arion { }; @@ -24788,6 +24870,8 @@ with pkgs; carddav-util = callPackage ../tools/networking/carddav-util { }; + cardinal = callPackage ../applications/audio/cardinal { }; + carla = libsForQt5.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; @@ -25255,12 +25339,12 @@ with pkgs; inherit (darwin) sigtool; }; - emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { + emacs27-nox = lowPrio (emacs27.override { withX = false; withNS = false; withGTK2 = false; withGTK3 = false; - })); + }); emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) @@ -25517,6 +25601,8 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; + globe-cli = callPackage ../applications/misc/globe-cli { }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -26446,6 +26532,8 @@ with pkgs; i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; + i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; @@ -26830,8 +26918,6 @@ with pkgs; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; - kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -27276,7 +27362,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); + mercurialFull = mercurial.override { fullBuild = true; }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; @@ -27548,7 +27634,6 @@ with pkgs; avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or stdenv.isLinux; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -27626,6 +27711,8 @@ with pkgs; ocenaudio = callPackage ../applications/audio/ocenaudio { }; + odo = callPackage ../applications/networking/cluster/odo { }; + onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; @@ -27666,6 +27753,8 @@ with pkgs; pijuice = with python3Packages; toPythonApplication pijuice; + pinegrow = callPackage ../applications/editors/pinegrow { }; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; @@ -27902,7 +27991,9 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { + ffmpeg_4 = ffmpeg-full; + }; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; @@ -27999,7 +28090,9 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { }; + orpie = callPackage ../applications/misc/orpie { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; osmo = callPackage ../applications/office/osmo { }; @@ -28769,6 +28862,8 @@ with pkgs; sxiv = callPackage ../applications/graphics/sxiv { }; + nsxiv = callPackage ../applications/graphics/nsxiv { }; + resilio-sync = callPackage ../applications/networking/resilio-sync { }; dropbox = callPackage ../applications/networking/dropbox { }; @@ -28861,7 +28956,7 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; + skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { }; soci = callPackage ../development/libraries/soci { }; @@ -28924,7 +29019,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocamlPackages) stog; + inherit (ocaml-ng.ocamlPackages_4_12) stog; stp = callPackage ../applications/science/logic/stp { }; @@ -29087,7 +29182,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { - inherit (xorg) libpthreadstubs libXdmcp; + abseil-cpp = abseil-cpp_202111; }; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; @@ -29453,6 +29548,8 @@ with pkgs; qtile = callPackage ../applications/window-managers/qtile { }; + vimgolf = callPackage ../games/vimgolf { }; + vimpc = callPackage ../applications/audio/vimpc { }; # this is a lower-level alternative to wrapNeovim conceived to handle @@ -29598,11 +29695,11 @@ with pkgs; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; - vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; + vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix { }; - vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {}; + vscode-utils = callPackage ../applications/editors/vscode/extensions/vscode-utils.nix { }; - vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {}); + vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; vscodium-fhs = vscodium.fhs; @@ -30125,7 +30222,7 @@ with pkgs; zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { }; + zammad = callPackage ../applications/networking/misc/zammad { }; zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; @@ -31068,7 +31165,7 @@ with pkgs; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; }) minetestclient_5 minetestserver_5; @@ -31387,9 +31484,6 @@ with pkgs; steam = steamPackages.steam-fhsenv; steam-run = steam.run; - steam-run-native = (steam.override { - nativeOnly = true; - }).run; steam-tui = callPackage ../games/steam-tui { }; @@ -31773,12 +31867,12 @@ with pkgs; octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; - openlpFull = appendToName "full" (openlp.override { + openlpFull = openlp.override { pdfSupport = true; presentationSupport = true; vlcSupport = true; gstreamerSupport = true; - }); + }; dkh = callPackage ../applications/science/chemistry/dkh { }; @@ -31816,6 +31910,8 @@ with pkgs; alliance = callPackage ../applications/science/electronics/alliance { }; + angsd = callPackage ../applications/science/biology/angsd { }; + ants = callPackage ../applications/science/biology/ants { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -31890,6 +31986,8 @@ with pkgs; fastp = callPackage ../applications/science/biology/fastp { }; + febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; @@ -31928,13 +32026,9 @@ with pkgs; n3 = callPackage ../applications/science/biology/N3 { }; - neuron = callPackage ../applications/science/biology/neuron { - python = null; - }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; - neuron-mpi = appendToName "mpi" (neuron.override { - useMpi = true; - }); + neuron-mpi = neuron.override {useMpi = true; }; neuron-full = neuron-mpi.override { python = python2; }; @@ -31984,9 +32078,7 @@ with pkgs; raxml = callPackage ../applications/science/biology/raxml { }; - raxml-mpi = appendToName "mpi" (raxml.override { - useMpi = true; - }); + raxml-mpi = raxml.override { useMpi = true; }; sambamba = callPackage ../applications/science/biology/sambamba { }; @@ -32060,6 +32152,8 @@ with pkgs; blas-reference = callPackage ../development/libraries/science/math/blas { }; + bonmin = callPackage ../development/libraries/science/math/bonmin { }; + brial = callPackage ../development/libraries/science/math/brial { }; clblas = callPackage ../development/libraries/science/math/clblas { @@ -32083,6 +32177,8 @@ with pkgs; lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; liblapack = lapack-reference; + libamplsolver = callPackage ../development/libraries/science/math/libamplsolver { }; + libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; @@ -32237,6 +32333,7 @@ with pkgs; singlePrec = true; enableMpi = true; enableCuda = true; + cudatoolkit = cudatoolkit_11; fftw = fftwSinglePrec; }); @@ -32283,7 +32380,9 @@ with pkgs; abc-verifier = callPackage ../applications/science/logic/abc {}; - abella = callPackage ../applications/science/logic/abella { }; + abella = callPackage ../applications/science/logic/abella { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; acgtk = callPackage ../applications/science/logic/acgtk {}; @@ -32362,7 +32461,7 @@ with pkgs; hol = callPackage ../applications/science/logic/hol { }; - inherit (ocamlPackages) hol_light; + inherit (ocaml-ng.ocamlPackages_4_12) hol_light; hologram = callPackage ../tools/security/hologram { }; @@ -32426,7 +32525,9 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = callPackage ../applications/science/logic/prooftree {}; + prooftree = callPackage ../applications/science/logic/prooftree { + ocamlPackages = ocaml-ng.ocamlPackages_4_12; + }; prover9 = callPackage ../applications/science/logic/prover9 { }; @@ -32961,18 +33062,16 @@ with pkgs; dbacl = callPackage ../tools/misc/dbacl { }; - dblatex = callPackage ../tools/typesetting/tex/dblatex { - enableAllFeatures = false; - }; + dblatex = callPackage ../tools/typesetting/tex/dblatex { }; - dblatexFull = appendToName "full" (dblatex.override { - enableAllFeatures = true; - }); + dblatexFull = dblatex.override { enableAllFeatures = true; }; dbus-map = callPackage ../tools/misc/dbus-map { }; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + dockutil = callPackage ../os-specific/darwin/dockutil { }; + dosbox = callPackage ../applications/emulators/dosbox { }; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; @@ -33165,6 +33264,8 @@ with pkgs; jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; + k40-whisperer = callPackage ../applications/misc/k40-whisperer { }; + keynav = callPackage ../tools/X11/keynav { }; kgx = callPackage ../applications/terminal-emulators/kgx { }; @@ -33251,7 +33352,7 @@ with pkgs; nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); + nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; @@ -33566,7 +33667,9 @@ with pkgs; pgmanage = callPackage ../applications/misc/pgmanage { }; - pgadmin = callPackage ../applications/misc/pgadmin { + pgadmin4 = callPackage ../tools/admin/pgadmin { }; + + pgadmin3 = callPackage ../tools/admin/pgadmin/3.nix { openssl = openssl_1_0_2; }; @@ -33981,12 +34084,11 @@ with pkgs; viewnior = callPackage ../applications/graphics/viewnior { }; - - vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { + vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { inherit (lua51Packages) hasLuaModule; }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { llvmPackages = llvmPackages_6; luaPackages = lua51Packages; }); @@ -34139,6 +34241,8 @@ with pkgs; xosview2 = callPackage ../tools/X11/xosview2 { }; + xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index d9a96164c6..5f043faecf 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -284,6 +284,8 @@ in { ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + dddvb = callPackage ../os-specific/linux/dddvb { }; + digimend = callPackage ../os-specific/linux/digimend { }; dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; @@ -460,6 +462,8 @@ in { xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null; + xpadneo = callPackage ../os-specific/linux/xpadneo { }; zenpower = callPackage ../os-specific/linux/zenpower { }; @@ -530,7 +534,7 @@ in { }); packageAliases = { - linux_default = packages.linux_5_10; + linux_default = if stdenv.hostPlatform.isi686 then packages.linux_5_10 else packages.linux_5_15; # Update this when adding the newest kernel major version! linux_latest = packages.linux_5_16; linux_mptcp = packages.linux_mptcp_95; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index fe7fd7d856..bf8a055e1a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -620,7 +620,7 @@ let lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; - lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; + lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lens = callPackage ../development/ocaml-modules/lens { }; @@ -1193,8 +1193,6 @@ let ptset = callPackage ../development/ocaml-modules/ptset { }; - pycaml = callPackage ../development/ocaml-modules/pycaml { }; - pyml = callPackage ../development/ocaml-modules/pyml { }; qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; @@ -1541,5 +1539,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_13; - ocamlPackages = ocamlPackages_4_12; + ocamlPackages = ocamlPackages_4_13; } diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 2212d4b5da..d6745c559e 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -6564,6 +6564,21 @@ let buildInputs = [ DBDSQLite TestFatal TestRoo ]; }; + DevelCamelcadedb = buildPerlPackage { + pname = "Devel-Camelcadedb"; + version = "2021.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2021.2.tar.gz"; + sha256 = "88a1d9e95d398ffe4d4114861e21c36f7c22315b3d03e7f764ccbce018ab3e47"; + }; + propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; + license = lib.licenses.mit; + }; + }; + DevelCycle = buildPerlPackage { pname = "Devel-Cycle"; version = "1.12"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 3a9bd1f1fe..81628686a3 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -140,6 +140,10 @@ lib.makeScope pkgs.newScope (self: with self; { deployer = callPackage ../development/php-packages/deployer { }; + grumphp = callPackage ../development/php-packages/grumphp { }; + + phing = callPackage ../development/php-packages/phing { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index c506c82337..b72a6fb062 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ self: let inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; namePrefix = python.libPrefix + "-"; @@ -107,7 +107,7 @@ in { inherit pkgs stdenv; - inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; @@ -186,6 +186,8 @@ in { actdiag = callPackage ../development/python-modules/actdiag { }; + adafruit-io = callPackage ../development/python-modules/adafruit-io { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; @@ -222,6 +224,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + aesara = callPackage ../development/python-modules/aesara { }; + afdko = callPackage ../development/python-modules/afdko { }; affine = callPackage ../development/python-modules/affine { }; @@ -710,6 +714,8 @@ in { asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { }; + asyncssh = callPackage ../development/python-modules/asyncssh { }; asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; @@ -760,6 +766,8 @@ in { inherit (pkgs) augeas; }; + augmax = callPackage ../development/python-modules/augmax { }; + auroranoaa = callPackage ../development/python-modules/auroranoaa { }; aurorapy = callPackage ../development/python-modules/aurorapy { }; @@ -1166,6 +1174,8 @@ in { beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + beartype = callPackage ../development/python-modules/beartype { }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beautifultable = callPackage ../development/python-modules/beautifultable { }; @@ -1204,9 +1214,7 @@ in { binwalk = callPackage ../development/python-modules/binwalk { }; - binwalk-full = appendToName "full" (self.binwalk.override { - visualizationSupport = true; - }); + binwalk-full = self.binwalk.override { visualizationSupport = true; }; biopython = callPackage ../development/python-modules/biopython { }; @@ -1821,6 +1829,8 @@ in { connexion = callPackage ../development/python-modules/connexion { }; + cons = callPackage ../development/python-modules/cons { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; @@ -1984,6 +1994,8 @@ in { daphne = callPackage ../development/python-modules/daphne { }; + dasbus = callPackage ../development/python-modules/dasbus { }; + dash = callPackage ../development/python-modules/dash { }; dash-core-components = callPackage ../development/python-modules/dash-core-components { }; @@ -2038,9 +2050,7 @@ in { datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { }; - datashader = callPackage ../development/python-modules/datashader { - dask = self.dask.override { withExtraComplete = true; }; - }; + datashader = callPackage ../development/python-modules/datashader { }; datashape = callPackage ../development/python-modules/datashape { }; @@ -2673,6 +2683,8 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + etuples = callPackage ../development/python-modules/etuples { }; + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; @@ -2839,6 +2851,8 @@ in { ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { }; + fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; + fido2 = callPackage ../development/python-modules/fido2 { }; fields = callPackage ../development/python-modules/fields { }; @@ -3017,6 +3031,8 @@ in { flax = callPackage ../development/python-modules/flax { }; + fleep = callPackage ../development/python-modules/fleep { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -3563,6 +3579,8 @@ in { growattserver = callPackage ../development/python-modules/growattserver { }; + gridnet = callPackage ../development/python-modules/gridnet { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; @@ -3912,6 +3930,8 @@ in { icmplib = callPackage ../development/python-modules/icmplib { }; + icnsutil = callPackage ../development/python-modules/icnsutil { }; + ics = callPackage ../development/python-modules/ics { }; idasen = callPackage ../development/python-modules/idasen { }; @@ -4332,6 +4352,8 @@ in { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; + jupyter_server = callPackage ../development/python-modules/jupyter_server { }; jupyterhub = callPackage ../development/python-modules/jupyterhub { }; @@ -4354,6 +4376,8 @@ in { jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; + jupyterlab-lsp = callPackage ../development/python-modules/jupyterlab-lsp { }; + jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { @@ -4791,6 +4815,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logical-unification = callPackage ../development/python-modules/logical-unification { }; + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; @@ -5086,6 +5112,8 @@ in { minidump = callPackage ../development/python-modules/minidump { }; + minikanren = callPackage ../development/python-modules/minikanren { }; + minikerberos = callPackage ../development/python-modules/minikerberos { }; minimock = callPackage ../development/python-modules/minimock { }; @@ -5450,6 +5478,8 @@ in { nextcloudmonitor = callPackage ../development/python-modules/nextcloudmonitor { }; + nextcord = callPackage ../development/python-modules/nextcord { }; + nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; @@ -5588,6 +5618,8 @@ in { numba = callPackage ../development/python-modules/numba { }; + numba-scipy = callPackage ../development/python-modules/numba-scipy { }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; @@ -5721,6 +5753,8 @@ in { opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + opensfm = callPackage ../development/python-modules/opensfm { }; + openshift = callPackage ../development/python-modules/openshift { }; opensimplex = callPackage ../development/python-modules/opensimplex { }; @@ -6062,6 +6096,8 @@ in { pdunehd = callPackage ../development/python-modules/pdunehd { }; + pyprecice = callPackage ../development/python-modules/pyprecice { }; + phonopy = callPackage ../development/python-modules/phonopy { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; @@ -6749,6 +6785,8 @@ in { pyct = callPackage ../development/python-modules/pyct { }; + pyctr = callPackage ../development/python-modules/pyctr { }; + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; @@ -7599,6 +7637,8 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pysignalclirestapi = callPackage ../development/python-modules/pysignalclirestapi { }; + pysigset = callPackage ../development/python-modules/pysigset { }; pysimplegui = callPackage ../development/python-modules/pysimplegui { }; @@ -8205,6 +8245,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-trovo = callPackage ../development/python-modules/python-trovo { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; python-twitter = callPackage ../development/python-modules/python-twitter { }; @@ -8533,6 +8575,8 @@ in { radio_beam = callPackage ../development/python-modules/radio_beam { }; + radios = callPackage ../development/python-modules/radios { }; + radiotherm = callPackage ../development/python-modules/radiotherm { }; radish-bdd = callPackage ../development/python-modules/radish-bdd { }; @@ -8575,6 +8619,8 @@ in { re-assert = callPackage ../development/python-modules/re-assert { }; + readability-lxml = callPackage ../development/python-modules/readability-lxml { }; + readchar = callPackage ../development/python-modules/readchar { }; readlike = callPackage ../development/python-modules/readlike { }; @@ -8719,6 +8765,8 @@ in { rich = callPackage ../development/python-modules/rich { }; + rich-rst = callPackage ../development/python-modules/rich-rst { }; + rig = callPackage ../development/python-modules/rig { }; ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; @@ -9818,6 +9866,8 @@ in { textile = callPackage ../development/python-modules/textile { }; + textual = callPackage ../development/python-modules/textual { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; @@ -9893,6 +9943,8 @@ in { tika = callPackage ../development/python-modules/tika { }; + tikzplotlib = callPackage ../development/python-modules/tikzplotlib { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; @@ -9967,6 +10019,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torch-tb-profiler = callPackage ../development/python-modules/torch-tb-profiler/default.nix { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; torchgpipe = callPackage ../development/python-modules/torchgpipe { }; @@ -10093,6 +10147,8 @@ in { twitch-python = callPackage ../development/python-modules/twitch-python { }; + twitchapi = callPackage ../development/python-modules/twitchapi { }; + twitter = callPackage ../development/python-modules/twitter { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; @@ -10141,14 +10197,22 @@ in { typer = callPackage ../development/python-modules/typer { }; + types-cryptography = callPackage ../development/python-modules/types-cryptography { }; + types-dateutil = callPackage ../development/python-modules/types-dateutil { }; types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-enum34 = callPackage ../development/python-modules/types-enum34 { }; + types-freezegun = callPackage ../development/python-modules/types-freezegun { }; types-futures = callPackage ../development/python-modules/types-futures { }; + types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + + types-paramiko = callPackage ../development/python-modules/types-paramiko { }; + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; types-pytz = callPackage ../development/python-modules/types-pytz { }; @@ -10383,6 +10447,8 @@ in { veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + videocr = callPackage ../development/python-modules/videocr { }; + vidstab = callPackage ../development/python-modules/vidstab { }; ViennaRNA = toPythonModule pkgs.ViennaRNA; @@ -10425,6 +10491,8 @@ in { voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + volvooncall = callPackage ../development/python-modules/volvooncall { }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; vpk = callPackage ../development/python-modules/vpk { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix index b98357a2cb..224acec162 100644 --- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix @@ -46,6 +46,8 @@ with self; with super; { google-apputils = callPackage ../development/python2-modules/google-apputils { }; + gtkme = callPackage ../development/python2-modules/gtkme { }; + httpretty = callPackage ../development/python2-modules/httpretty { }; hypothesis = callPackage ../development/python2-modules/hypothesis { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index d9cc05afe7..751236fdcb 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -116,8 +116,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };